diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/mman-linux.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/mman.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/mman.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/bits/mman.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/mman.h | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/bits/mman.h | 9 |
7 files changed, 43 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog index 0e8b883f5b..b47c28fc0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> * sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Use diff --git a/sysdeps/unix/sysv/linux/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h index 69ed247dbf..6c06069cdc 100644 --- a/sysdeps/unix/sysv/linux/bits/mman-linux.h +++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h @@ -92,3 +92,10 @@ # define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ # define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ #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 diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h index 602cebfcd4..3f72c03351 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h @@ -22,10 +22,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> - #define PROT_SAO 0x10 /* Strong Access Ordering. */ @@ -46,3 +42,6 @@ #define MCL_CURRENT 0x2000 /* Lock all currently mapped pages. */ #define MCL_FUTURE 0x4000 /* Lock all additions to address space. */ + +/* Include generic Linux declarations. */ +#include <bits/mman-linux.h> diff --git a/sysdeps/unix/sysv/linux/s390/bits/mman.h b/sysdeps/unix/sysv/linux/s390/bits/mman.h index 59f4511845..3a65ba13c0 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/mman.h +++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h @@ -39,7 +39,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> diff --git a/sysdeps/unix/sysv/linux/sh/bits/mman.h b/sysdeps/unix/sysv/linux/sh/bits/mman.h index 0573f83105..396a9b918f 100644 --- a/sysdeps/unix/sysv/linux/sh/bits/mman.h +++ b/sysdeps/unix/sysv/linux/sh/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> - /* These are Linux-specific. */ #ifdef __USE_MISC # define MAP_GROWSDOWN 0x0100 /* Stack-like segment. */ @@ -39,7 +36,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> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h index 01c00c80f9..ad0389ca3f 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h @@ -23,13 +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_RENAME MAP_ANONYMOUS -#endif /* These are Linux-specific. */ #ifdef __USE_MISC @@ -49,3 +42,10 @@ #define MCL_CURRENT 0x2000 /* Lock all currently mapped pages. */ #define MCL_FUTURE 0x4000 /* Lock all additions to address space. */ +/* Include generic Linux declarations. */ +#include <bits/mman-linux.h> + +/* Other flags. */ +#ifdef __USE_MISC +# define MAP_RENAME MAP_ANONYMOUS +#endif 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> |