diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mmap64.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 37a825ef69..a05d2625b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-08-05 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/mmap64.c: Move MMAP2_PAGE_SHIFT define + before first use. + +2015-08-05 Mike Frysinger <vapier@gentoo.org> + * nptl/allocatestack.c (allocate_stack): Move stacktop decl down to bottom and under _STACK_GROWS_DOWN. Move the stacktop assignment in there too. diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c index a8da641d2b..0b160b6f6b 100644 --- a/sysdeps/unix/sysv/linux/mmap64.c +++ b/sysdeps/unix/sysv/linux/mmap64.c @@ -25,12 +25,12 @@ #include <sys/syscall.h> /* This is always 12, even on architectures where PAGE_SHIFT != 12. */ +#ifndef MMAP2_PAGE_SHIFT +# define MMAP2_PAGE_SHIFT 12 +#endif #if MMAP2_PAGE_SHIFT == -1 static int page_shift; #else -# ifndef MMAP2_PAGE_SHIFT -# define MMAP2_PAGE_SHIFT 12 -# endif #define page_shift MMAP2_PAGE_SHIFT #endif |