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.
This commit is contained in:
Andreas Jaeger 2013-03-05 19:40:13 +01:00
parent 5f67c04f5e
commit 890b58d3bd
7 changed files with 43 additions and 29 deletions

View File

@ -1,3 +1,23 @@
2013-03-04 Andreas Jaeger <aj@suse.de>
* 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.
2013-03-05 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> 2013-03-05 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Use * sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Use

View File

@ -92,3 +92,10 @@
# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ # define POSIX_MADV_WILLNEED 3 /* Will need these pages. */
# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ # define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */
#endif #endif
/* Flags for `mlockall'. */
#ifndef MCL_CURRENT
# define MCL_CURRENT 1 /* Lock all currently mapped pages. */
# define MCL_FUTURE 2 /* Lock all additions to address
space. */
#endif

View File

@ -22,10 +22,6 @@
/* The following definitions basically come from the kernel headers. /* The following definitions basically come from the kernel headers.
But the kernel header is not namespace clean. */ But the kernel header is not namespace clean. */
/* Include generic Linux declarations. */
#include <bits/mman-linux.h>
#define PROT_SAO 0x10 /* Strong Access Ordering. */ #define PROT_SAO 0x10 /* Strong Access Ordering. */
@ -46,3 +42,6 @@
#define MCL_CURRENT 0x2000 /* Lock all currently mapped pages. */ #define MCL_CURRENT 0x2000 /* Lock all currently mapped pages. */
#define MCL_FUTURE 0x4000 /* Lock all additions to address #define MCL_FUTURE 0x4000 /* Lock all additions to address
space. */ space. */
/* Include generic Linux declarations. */
#include <bits/mman-linux.h>

View File

@ -39,7 +39,5 @@
# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */ # define MAP_HUGETLB 0x40000 /* Create huge page mapping. */
#endif #endif
/* Flags for `mlockall'. */ /* Include generic Linux declarations. */
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */ #include <bits/mman-linux.h>
#define MCL_FUTURE 2 /* Lock all additions to address
space. */

View File

@ -23,9 +23,6 @@
/* The following definitions basically come from the kernel headers. /* The following definitions basically come from the kernel headers.
But the kernel header is not namespace clean. */ But the kernel header is not namespace clean. */
/* Include generic Linux declarations. */
#include <bits/mman-linux.h>
/* These are Linux-specific. */ /* These are Linux-specific. */
#ifdef __USE_MISC #ifdef __USE_MISC
# define MAP_GROWSDOWN 0x0100 /* Stack-like segment. */ # define MAP_GROWSDOWN 0x0100 /* Stack-like segment. */
@ -39,7 +36,5 @@
# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */ # define MAP_HUGETLB 0x40000 /* Create huge page mapping. */
#endif #endif
/* Flags for `mlockall'. */ /* Include generic Linux declarations. */
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */ #include <bits/mman-linux.h>
#define MCL_FUTURE 2 /* Lock all additions to address
space. */

View File

@ -23,13 +23,6 @@
/* The following definitions basically come from the kernel headers. /* The following definitions basically come from the kernel headers.
But the kernel header is not namespace clean. */ But the kernel header is not namespace clean. */
/* Include generic Linux declarations. */
#include <bits/mman-linux.h>
/* Other flags. */
#ifdef __USE_MISC
# define MAP_RENAME MAP_ANONYMOUS
#endif
/* These are Linux-specific. */ /* These are Linux-specific. */
#ifdef __USE_MISC #ifdef __USE_MISC
@ -49,3 +42,10 @@
#define MCL_CURRENT 0x2000 /* Lock all currently mapped pages. */ #define MCL_CURRENT 0x2000 /* Lock all currently mapped pages. */
#define MCL_FUTURE 0x4000 /* Lock all additions to address #define MCL_FUTURE 0x4000 /* Lock all additions to address
space. */ space. */
/* Include generic Linux declarations. */
#include <bits/mman-linux.h>
/* Other flags. */
#ifdef __USE_MISC
# define MAP_RENAME MAP_ANONYMOUS
#endif

View File

@ -23,9 +23,6 @@
/* The following definitions basically come from the kernel headers. /* The following definitions basically come from the kernel headers.
But the kernel header is not namespace clean. */ But the kernel header is not namespace clean. */
/* Include generic Linux declarations. */
#include <bits/mman-linux.h>
/* Other flags. */ /* Other flags. */
#ifdef __USE_MISC #ifdef __USE_MISC
# define MAP_32BIT 0x40 /* Only give out 32-bit addresses. */ # define MAP_32BIT 0x40 /* Only give out 32-bit addresses. */
@ -44,7 +41,5 @@
# define MAP_HUGETLB 0x40000 /* Create huge page mapping. */ # define MAP_HUGETLB 0x40000 /* Create huge page mapping. */
#endif #endif
/* Flags for `mlockall'. */ /* Include generic Linux declarations. */
#define MCL_CURRENT 1 /* Lock all currently mapped pages. */ #include <bits/mman-linux.h>
#define MCL_FUTURE 2 /* Lock all additions to address
space. */