This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-306-g960af48
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 31 Mar 2010 21:08:00 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-306-g960af48
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 960af486d29fb1c233c5cd92e1d6dc029daeb7af (commit)
from 6d28d423b2e47ad3534fb8807f4b0f31c2c0fa9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=960af486d29fb1c233c5cd92e1d6dc029daeb7af
commit 960af486d29fb1c233c5cd92e1d6dc029daeb7af
Author: David S. Miller <davem@davemloft.net>
Date: Wed Mar 31 14:07:39 2010 -0700
Fix build of mmap64.
diff --git a/ChangeLog b/ChangeLog
index 55b4d84..dafce4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/unix/sysv/linux/mmap64.c (__mmap64): Fix
+ MMAP2_PAGE_SHIFT test.
+
2010-03-29 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/socket.h: Define MSG_WAITFORONE.
diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c
index 85c801d..b24b3f0 100644
--- a/sysdeps/unix/sysv/linux/mmap64.c
+++ b/sysdeps/unix/sysv/linux/mmap64.c
@@ -49,7 +49,7 @@ void *
__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 ();
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/mmap64.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources