From 1dad8fe1edcfc6f1cfcf850d76aa5657502cb291 Mon Sep 17 00:00:00 2001 From: Andrew Gallatin Date: Mon, 28 Jun 2004 19:15:40 +0000 Subject: [PATCH] Fix alpha - the use of min() on longs was loosing the high bits and returning wrong answers, leading to strange values vm2->vm_{s,t,d}size. --- sys/vm/vm_map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index df479915189..e15cf098d71 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 = min(entry->end, + newend = ulmin(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 = min(entry->end, + newend = ulmin(entry->end, (vm_offset_t)vm1->vm_taddr + ctob(vm1->vm_tsize)); vm2->vm_tsize += btoc(newend - entry->start); }