commit 4763ef2b5bffd341ed5723020569ba696e734536
author Elliott Hughes <enh@google.com> Wed Jul 17 13:05:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 17 13:05:13 2013 -0700
tree c1d717cdefeafc7763d3d490298838d5102eb128
parent 6f08b8659a3682b7e774af6ed68b1b613e147f1b
parent b7b36b819e8029a152859f3204ba2da38a0e2879

am b7b36b81: Merge "mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps"

* commit 'b7b36b819e8029a152859f3204ba2da38a0e2879':
  mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps

libc/bionic/mmap.c

diff --git a/libc/bionic/mmap.c b/libc/bionic/mmap.c
index 40a6538..e097086 100644
--- a/libc/bionic/mmap.c
+++ b/libc/bionic/mmap.c
@@ -34,10 +34,17 @@
 #define  MMAP2_SHIFT  12
 void* mmap(void *addr, size_t size, int prot, int flags, int fd, long offset)
 {
+    void *ret;
+
     if (offset & ((1UL << MMAP2_SHIFT)-1)) {
         errno = EINVAL;
         return MAP_FAILED;
     }
 
-    return __mmap2(addr, size, prot, flags, fd, (size_t)offset >> MMAP2_SHIFT);
+    ret = __mmap2(addr, size, prot, flags, fd, (size_t)offset >> MMAP2_SHIFT);
+
+    if (ret && (flags & (MAP_PRIVATE | MAP_ANONYMOUS)))
+	    madvise(ret, size, MADV_MERGEABLE);
+
+    return ret;
 }