[src/netbsd-1-6]: src/sys/uvm Pull up revision 1.72 (requested by tv in ticke...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8badd6c5856d
branches:  netbsd-1-6
changeset: 530582:8badd6c5856d
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Aug 17 10:14:52 2003 +0000

description:
Pull up revision 1.72 (requested by tv in ticket #1420):
PR/21948: Todd Vierling: Implement MAP_TRYFIXED for linux emulation.

diffstat:

 sys/uvm/uvm_mmap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 20435c0b5c82 -r 8badd6c5856d sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Sat Aug 16 19:54:07 2003 +0000
+++ b/sys/uvm/uvm_mmap.c        Sun Aug 17 10:14:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.63 2002/03/22 11:06:33 darrenr Exp $    */
+/*     $NetBSD: uvm_mmap.c,v 1.63.4.1 2003/08/17 10:14:52 tron Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.63 2002/03/22 11:06:33 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.63.4.1 2003/08/17 10:14:52 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -346,7 +346,7 @@
                if (addr > addr + size)
                        return (EOVERFLOW);             /* no wrapping! */
 
-       } else {
+       } else if (addr == NULL || !(flags & MAP_TRYFIXED)) {
 
                /*
                 * not fixed: make sure we skip over the largest possible heap.