[src/netbsd-1-6]: src/sys/compat/linux/common Pullup rev 1.119 (ticket #1428)

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

details:   https://anonhg.NetBSD.org/src/rev/1e6f2c2737dc
branches:  netbsd-1-6
changeset: 530972:1e6f2c2737dc
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sun Oct 26 06:36:37 2003 +0000

description:
Pullup rev 1.119 (ticket #1428)

Implement MAP_TRYFIXED for linux emulation.

diffstat:

 sys/compat/linux/common/linux_misc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 042772d45f07 -r 1e6f2c2737dc sys/compat/linux/common/linux_misc.c
--- a/sys/compat/linux/common/linux_misc.c      Sun Oct 26 00:37:43 2003 +0000
+++ b/sys/compat/linux/common/linux_misc.c      Sun Oct 26 06:36:37 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_misc.c,v 1.109.4.4 2003/10/22 04:03:51 jmc Exp $ */
+/*     $NetBSD: linux_misc.c,v 1.109.4.5 2003/10/26 06:36:37 jmc Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.109.4.4 2003/10/22 04:03:51 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.109.4.5 2003/10/26 06:36:37 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -492,7 +492,7 @@
        struct sys_mmap_args *cma;
        const struct linux_sys_mmap_args *uap;
 {
-       int flags = 0, fl = SCARG(uap, flags);
+       int flags = MAP_TRYFIXED, fl = SCARG(uap, flags);
        
        flags |= cvtto_bsd_mask(fl, LINUX_MAP_SHARED, MAP_SHARED);
        flags |= cvtto_bsd_mask(fl, LINUX_MAP_PRIVATE, MAP_PRIVATE);