From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 28 Jun 2013 21:45:11 +0000 (+0000)
Subject: Consistently use page_shift in sysdeps/unix/sysv/linux/mmap64.c.
X-Git-Tag: upstream/2.20~1890
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fbec010989a242f6eb17be837255502c459977d;p=platform%2Fupstream%2Flinaro-glibc.git

Consistently use page_shift in sysdeps/unix/sysv/linux/mmap64.c.
---

diff --git a/ChangeLog b/ChangeLog
index 8d81f2d..f3da517 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 175e4ab..e2dcdc4 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)