Module Name: src
Committed By: njoly
Date: Sat Mar 14 08:32:08 UTC 2015
Modified Files:
src/sys/compat/linux/arch/alpha: linux_mmap.h
src/sys/compat/linux/arch/amd64: linux_mmap.h
src/sys/compat/linux/arch/arm: linux_mmap.h
src/sys/compat/linux/arch/i386: linux_mmap.h
src/sys/compat/linux/arch/m68k: linux_mmap.h
src/sys/compat/linux/arch/mips: linux_mmap.h
src/sys/compat/linux/arch/powerpc: linux_mmap.h
src/sys/compat/linux/arch/sparc: linux_mmap.h
src/sys/compat/linux/common: linux_misc.c
Log Message:
Support Linux MAP_LOCKED mmap flag.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/alpha/linux_mmap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/linux/arch/amd64/linux_mmap.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/arm/linux_mmap.h
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/i386/linux_mmap.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/m68k/linux_mmap.h
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/mips/linux_mmap.h
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/powerpc/linux_mmap.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/arch/sparc/linux_mmap.h
cvs rdiff -u -r1.230 -r1.231 src/sys/compat/linux/common/linux_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/linux_mmap.h
diff -u src/sys/compat/linux/arch/alpha/linux_mmap.h:1.4 src/sys/compat/linux/arch/alpha/linux_mmap.h:1.5
--- src/sys/compat/linux/arch/alpha/linux_mmap.h:1.4 Mon Apr 28 20:23:42 2008
+++ src/sys/compat/linux/arch/alpha/linux_mmap.h Sat Mar 14 08:32:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.4 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.5 2015/03/14 08:32:07 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,8 +36,9 @@
/* LINUX_MAP_SHARED/PRIVATE defined in common/linux_mmap.h */
-#define LINUX_MAP_ANON 0x0010
-#define LINUX_MAP_FIXED 0x0100
+#define LINUX_MAP_ANON 0x00010
+#define LINUX_MAP_FIXED 0x00100
+#define LINUX_MAP_LOCKED 0x08000
/* the following flags are silently ignored */
@@ -48,7 +49,6 @@
#define LINUX_MAP_GROWSDOWN 0x01000
#define LINUX_MAP_DENYWRITE 0x02000
#define LINUX_MAP_EXECUTABLE 0x04000
-#define LINUX_MAP_LOCKED 0x08000
#define LINUX_MAP_NORESERVE 0x10000
Index: src/sys/compat/linux/arch/amd64/linux_mmap.h
diff -u src/sys/compat/linux/arch/amd64/linux_mmap.h:1.2 src/sys/compat/linux/arch/amd64/linux_mmap.h:1.3
--- src/sys/compat/linux/arch/amd64/linux_mmap.h:1.2 Sun Dec 11 12:20:14 2005
+++ src/sys/compat/linux/arch/amd64/linux_mmap.h Sat Mar 14 08:32:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.2 2005/12/11 12:20:14 christos Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.3 2015/03/14 08:32:07 njoly Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -34,12 +34,9 @@
#ifndef _AMD64_LINUX_MMAP_H
#define _AMD64_LINUX_MMAP_H
-#define LINUX_MAP_FIXED 0x10
-#define LINUX_MAP_ANON 0x20
+#define LINUX_MAP_FIXED 0x0010
+#define LINUX_MAP_ANON 0x0020
#define LINUX_MAP_GROWSDOWN 0x0100
-
-
-
-
+#define LINUX_MAP_LOCKED 0x2000
#endif /* !_AMD64_LINUX_MMAP_H */
Index: src/sys/compat/linux/arch/arm/linux_mmap.h
diff -u src/sys/compat/linux/arch/arm/linux_mmap.h:1.4 src/sys/compat/linux/arch/arm/linux_mmap.h:1.5
--- src/sys/compat/linux/arch/arm/linux_mmap.h:1.4 Mon Apr 28 20:23:42 2008
+++ src/sys/compat/linux/arch/arm/linux_mmap.h Sat Mar 14 08:32:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.4 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.5 2015/03/14 08:32:07 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -38,13 +38,13 @@
#define LINUX_MAP_FIXED 0x0010
#define LINUX_MAP_ANON 0x0020
+#define LINUX_MAP_LOCKED 0x2000
/* the following flags are silently ignored */
#define LINUX_MAP_GROWSDOWN 0x0100
#define LINUX_MAP_DENYWRITE 0x0800
#define LINUX_MAP_EXECUTABLE 0x1000
-#define LINUX_MAP_LOCKED 0x2000
#define LINUX_MAP_NORESERVE 0x4000
#endif /* !_ARM_LINUX_MMAP_H */
Index: src/sys/compat/linux/arch/i386/linux_mmap.h
diff -u src/sys/compat/linux/arch/i386/linux_mmap.h:1.6 src/sys/compat/linux/arch/i386/linux_mmap.h:1.7
--- src/sys/compat/linux/arch/i386/linux_mmap.h:1.6 Mon Apr 28 20:23:42 2008
+++ src/sys/compat/linux/arch/i386/linux_mmap.h Sat Mar 14 08:32:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.6 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.7 2015/03/14 08:32:08 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -38,13 +38,13 @@
#define LINUX_MAP_FIXED 0x0010
#define LINUX_MAP_ANON 0x0020
+#define LINUX_MAP_LOCKED 0x2000
/* the following flags are silently ignored */
#define LINUX_MAP_GROWSDOWN 0x0100
#define LINUX_MAP_DENYWRITE 0x0800
#define LINUX_MAP_EXECUTABLE 0x1000
-#define LINUX_MAP_LOCKED 0x2000
#define LINUX_MAP_NORESERVE 0x4000
#endif /* !_I386_LINUX_MMAP_H */
Index: src/sys/compat/linux/arch/m68k/linux_mmap.h
diff -u src/sys/compat/linux/arch/m68k/linux_mmap.h:1.4 src/sys/compat/linux/arch/m68k/linux_mmap.h:1.5
--- src/sys/compat/linux/arch/m68k/linux_mmap.h:1.4 Mon Apr 28 20:23:42 2008
+++ src/sys/compat/linux/arch/m68k/linux_mmap.h Sat Mar 14 08:32:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.4 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.5 2015/03/14 08:32:08 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -38,13 +38,13 @@
#define LINUX_MAP_FIXED 0x0010
#define LINUX_MAP_ANON 0x0020
+#define LINUX_MAP_LOCKED 0x2000
/* the following flags are silently ignored */
#define LINUX_MAP_GROWSDOWN 0x0100
#define LINUX_MAP_DENYWRITE 0x0800
#define LINUX_MAP_EXECUTABLE 0x1000
-#define LINUX_MAP_LOCKED 0x2000
#define LINUX_MAP_NORESERVE 0x4000
#endif /* !_M68K_LINUX_MMAP_H */
Index: src/sys/compat/linux/arch/mips/linux_mmap.h
diff -u src/sys/compat/linux/arch/mips/linux_mmap.h:1.8 src/sys/compat/linux/arch/mips/linux_mmap.h:1.9
--- src/sys/compat/linux/arch/mips/linux_mmap.h:1.8 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/arch/mips/linux_mmap.h Sat Mar 14 08:32:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.8 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.9 2015/03/14 08:32:08 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
*/
#define LINUX_MAP_FIXED 0x0010
#define LINUX_MAP_ANON 0x0800 /* MAP_ANONYMOUS for Linux */
+#define LINUX_MAP_LOCKED 0x8000
/* Ignored */
#define LINUX_MAP_RENAME 0x0020
@@ -52,6 +53,5 @@
#define LINUX_MAP_GROWSDOWN 0x1000
#define LINUX_MAP_DENYWRITE 0x2000
#define LINUX_MAP_EXECUTABLE 0x4000
-#define LINUX_MAP_LOCKED 0x8000
#endif /* !_MIPS_LINUX_MMAP_H */
Index: src/sys/compat/linux/arch/powerpc/linux_mmap.h
diff -u src/sys/compat/linux/arch/powerpc/linux_mmap.h:1.6 src/sys/compat/linux/arch/powerpc/linux_mmap.h:1.7
--- src/sys/compat/linux/arch/powerpc/linux_mmap.h:1.6 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/arch/powerpc/linux_mmap.h Sat Mar 14 08:32:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.6 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.7 2015/03/14 08:32:08 njoly Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
*/
#define LINUX_MAP_FIXED 0x0010
#define LINUX_MAP_ANON 0x0020
+#define LINUX_MAP_LOCKED 0x0080
/* Ignored */
#define LINUX_MAP_NORESERVE 0x0040
Index: src/sys/compat/linux/arch/sparc/linux_mmap.h
diff -u src/sys/compat/linux/arch/sparc/linux_mmap.h:1.4 src/sys/compat/linux/arch/sparc/linux_mmap.h:1.5
--- src/sys/compat/linux/arch/sparc/linux_mmap.h:1.4 Mon Apr 28 20:23:43 2008
+++ src/sys/compat/linux/arch/sparc/linux_mmap.h Sat Mar 14 08:32:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mmap.h,v 1.4 2008/04/28 20:23:43 martin Exp $ */
+/* $NetBSD: linux_mmap.h,v 1.5 2015/03/14 08:32:08 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,11 +37,11 @@
#define LINUX_MAP_FIXED 0x0010
#define LINUX_MAP_ANON 0x0020
+#define LINUX_MAP_LOCKED 0x0100
/* Ignored */
#define LINUX_MAP_NORESERVE 0x0040
#define LINUX_MAP_INHERIT 0x0080
-#define LINUX_MAP_LOCKED 0x0100
#define LINUX_MAP_GROWSDOWN 0x0100
#define LINUX_MAP_DENYWRITE 0x0800
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.230 src/sys/compat/linux/common/linux_misc.c:1.231
--- src/sys/compat/linux/common/linux_misc.c:1.230 Sat Nov 22 13:18:45 2014
+++ src/sys/compat/linux/common/linux_misc.c Sat Mar 14 08:32:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.230 2014/11/22 13:18:45 njoly Exp $ */
+/* $NetBSD: linux_misc.c,v 1.231 2015/03/14 08:32:08 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.230 2014/11/22 13:18:45 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.231 2015/03/14 08:32:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -465,6 +465,7 @@ linux_to_bsd_mmap_args(struct sys_mmap_a
flags |= cvtto_bsd_mask(fl, LINUX_MAP_PRIVATE, MAP_PRIVATE);
flags |= cvtto_bsd_mask(fl, LINUX_MAP_FIXED, MAP_FIXED);
flags |= cvtto_bsd_mask(fl, LINUX_MAP_ANON, MAP_ANON);
+ flags |= cvtto_bsd_mask(fl, LINUX_MAP_LOCKED, MAP_WIRED);
/* XXX XAX ERH: Any other flags here? There are more defined... */
SCARG(cma, addr) = (void *)SCARG(uap, addr);
