+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
# 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
/* 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. */
#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>
# 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>
/* 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. */
# 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>
/* 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
#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
/* 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. */
# 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>