[src/netbsd-1-6]: src Pull up revision 1.32 (requested by tv in ticket #1420):

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

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

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

diffstat:

 lib/libc/sys/mmap.2 |  13 ++++++++++++-
 sys/sys/mman.h      |   3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 8badd6c5856d -r 48a6236eb4c0 lib/libc/sys/mmap.2
--- a/lib/libc/sys/mmap.2       Sun Aug 17 10:14:52 2003 +0000
+++ b/lib/libc/sys/mmap.2       Sun Aug 17 10:14:59 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: mmap.2,v 1.25 2002/02/08 01:28:19 ross Exp $
+.\"    $NetBSD: mmap.2,v 1.25.2.1 2003/08/17 10:14:59 tron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -149,6 +149,17 @@
 Permit regions to be inherited across
 .Xr execve 2
 system calls.
+.It Dv MAP_TRYFIXED
+Attempt to use the address
+.Fa addr
+even if it falls within the normally protected process data or
+text segment memory regions.  If the requested region of memory
+is actually present in the memory map, a different address will
+be selected as if MAP_TRYFIXED had not been specified.  If
+.Fa addr
+is
+.Fa NULL ,
+this flag is ignored and the system will select a mapping address.
 .It Dv MAP_PRIVATE
 Modifications made by this process are private, however modifications made by
 other processes using
diff -r 8badd6c5856d -r 48a6236eb4c0 sys/sys/mman.h
--- a/sys/sys/mman.h    Sun Aug 17 10:14:52 2003 +0000
+++ b/sys/sys/mman.h    Sun Aug 17 10:14:59 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mman.h,v 1.28 2000/10/18 01:43:18 assar Exp $  */
+/*     $NetBSD: mman.h,v 1.28.18.1 2003/08/17 10:14:59 tron Exp $      */
 
 /*-
  * Copyright (c) 1982, 1986, 1993
@@ -92,6 +92,7 @@
 #define        MAP_INHERIT      0x0080 /* region is retained after exec */
 #define        MAP_NOEXTEND     0x0100 /* for MAP_FILE, don't change file size */
 #define        MAP_HASSEMAPHORE 0x0200 /* region may contain semaphores */
+#define        MAP_TRYFIXED     0x0400 /* attempt hint address, even within break */
 
 /*
  * Mapping type