about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-06-28 21:45:11 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-06-28 21:45:11 +0000
commit8fbec010989a242f6eb17be837255502c459977d (patch)
treeae4b32016ae4e9514802189f2ac46219444d131a
parent0432680e8c2ecd832038387f92b462dea75e94cc (diff)
downloadglibc-8fbec010989a242f6eb17be837255502c459977d.tar.gz
glibc-8fbec010989a242f6eb17be837255502c459977d.tar.xz
glibc-8fbec010989a242f6eb17be837255502c459977d.zip
Consistently use page_shift in sysdeps/unix/sysv/linux/mmap64.c.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/mmap64.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d81f2d03e..f3da517047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/mmap64.c (__mmap64): Shift by page_shift
+	instead of MMAP2_PAGE_SHIFT in call to INLINE_SYSCALL.
+
 2013-06-28  Pierre Ynard  <linkfanel@yahoo.fr>
 
 	[BZ #12492]
diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c
index 175e4abba1..e2dcdc4d9a 100644
--- a/sysdeps/unix/sysv/linux/mmap64.c
+++ b/sysdeps/unix/sysv/linux/mmap64.c
@@ -56,7 +56,7 @@ __mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset)
   result = (void *)
     INLINE_SYSCALL (mmap2, 6, addr,
 		    len, prot, flags, fd,
-		    (off_t) (offset >> MMAP2_PAGE_SHIFT));
+		    (off_t) (offset >> page_shift));
   return result;
 }
 weak_alias (__mmap64, mmap64)