[commits] r10154 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/mmap64.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Apr  1 00:04:17 2010
New Revision: 10154

Log:
Import glibc-mainline for 2010-04-01

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/mmap64.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Apr  1 00:04:17 2010
@@ -1,3 +1,8 @@
+2010-03-30  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mmap64.c (__mmap64): Fix
+	MMAP2_PAGE_SHIFT test.
+
 2010-03-29  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/bits/socket.h: Define MSG_WAITFORONE.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/mmap64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/mmap64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/mmap64.c Thu Apr  1 00:04:17 2010
@@ -49,7 +49,7 @@
 __mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset)
 {
 #ifdef __NR_mmap2
-# ifdef MMAP2_PAGE_SHIFT == -1
+# if MMAP2_PAGE_SHIFT == -1
   if (page_shift == 0)
     {
       int page_size = getpagesize ();