about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/x86
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2013-03-05 19:40:13 +0100
committerAndreas Jaeger <aj@suse.de>2013-03-05 19:40:13 +0100
commit890b58d3bd5b2fb5964aa37153f16519e64025a5 (patch)
treed1336cea097b2971e5b057f12dd2e6cc5192653e /sysdeps/unix/sysv/linux/x86
parent5f67c04f5e076d3cfc4d810e7f5d65ce1788b749 (diff)
downloadglibc-890b58d3bd5b2fb5964aa37153f16519e64025a5.tar.gz
glibc-890b58d3bd5b2fb5964aa37153f16519e64025a5.tar.xz
glibc-890b58d3bd5b2fb5964aa37153f16519e64025a5.zip
Define MCL_CURRENT, MCL_FUTURE in bits/mman-linux.h
	* sysdeps/unix/sysv/linux/s390/bits/mman.h: Include
	<bits/mman-linux.h>.
	(MCL_CURRENT, MCL_FUTURE): Do not define here, the generic value
	is fine.
	* sysdeps/unix/sysv/linux/sh/bits/mman.h: Move include of
	<bits/mman-linux.h> to end of file.
	(MCL_CURRENT, MCL_FUTURE): Do not define here, the generic value
	is fine.
	* sysdeps/unix/sysv/linux/x86/bits/mman.h: Move include of
	<bits/mman-linux.h> to end of file.
	(MCL_CURRENT, MCL_FUTURE): Do not define here, the generic value
	is fine.
	* sysdeps/unix/sysv/linux/sparc/bits/mman.h: Move include of
	<bits/mman-linux.h> to end of file.

	* sysdeps/unix/sysv/linux/bits/mman-linux.h [!MCL_CURRENT]
	(MCL_CURRENT, MCL_FUTURE): Define here.
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86')
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/mman.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/x86/bits/mman.h b/sysdeps/unix/sysv/linux/x86/bits/mman.h
index 0f0f8b105f..a2fa808796 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/mman.h
@@ -23,9 +23,6 @@
 /* The following definitions basically come from the kernel headers.
    But the kernel header is not namespace clean.  */
 
-/* Include generic Linux declarations.  */
-#include <bits/mman-linux.h>
-
 /* Other flags.  */
 #ifdef __USE_MISC
 # define MAP_32BIT	0x40		/* Only give out 32-bit addresses.  */
@@ -44,7 +41,5 @@
 # define MAP_HUGETLB	0x40000		/* Create huge page mapping.  */
 #endif
 
-/* Flags for `mlockall'.  */
-#define MCL_CURRENT	1		/* Lock all currently mapped pages.  */
-#define MCL_FUTURE	2		/* Lock all additions to address
-					   space.  */
+/* Include generic Linux declarations.  */
+#include <bits/mman-linux.h>