diff options
author | Andrew Gallatin <gallatin@FreeBSD.org> | 2004-06-28 19:58:39 +0000 |
---|---|---|
committer | Andrew Gallatin <gallatin@FreeBSD.org> | 2004-06-28 19:58:39 +0000 |
commit | b351299ca3f879d0f811dbdb9911a5ea10744b22 (patch) | |
tree | 5114032ed705dbdcf00eeecea244cd25e6239a94 | |
parent | 1dad8fe1edcfc6f1cfcf850d76aa5657502cb291 (diff) | |
download | src-b351299ca3f879d0f811dbdb9911a5ea10744b22.tar.gz src-b351299ca3f879d0f811dbdb9911a5ea10744b22.zip |
Use MIN() macro rather than ulmin() inline, and fix stray tab
that snuck in with my last commit.
Submitted by: green
Notes
Notes:
svn path=/head/; revision=131252
-rw-r--r-- | sys/vm/vm_map.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index e15cf098d719..55726f5a7dc6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2360,12 +2360,12 @@ vmspace_map_entry_forked(const struct vmspace *vm1, struct vmspace *vm2, vm2->vm_ssize += btoc(entrysize); } else if (entry->start >= (vm_offset_t)vm1->vm_daddr && entry->start < (vm_offset_t)vm1->vm_daddr + ctob(vm1->vm_dsize)) { - newend = ulmin(entry->end, + newend = MIN(entry->end, (vm_offset_t)vm1->vm_daddr + ctob(vm1->vm_dsize)); - vm2->vm_dsize += btoc(newend - entry->start); + vm2->vm_dsize += btoc(newend - entry->start); } else if (entry->start >= (vm_offset_t)vm1->vm_taddr && entry->start < (vm_offset_t)vm1->vm_taddr + ctob(vm1->vm_tsize)) { - newend = ulmin(entry->end, + newend = MIN(entry->end, (vm_offset_t)vm1->vm_taddr + ctob(vm1->vm_tsize)); vm2->vm_tsize += btoc(newend - entry->start); } |