commit 635df850e5037be5093f64a87ec2e0a23bf7a50b
author Nick Kralevich <nnk@google.com> Mon Nov 19 11:23:10 2012 -0800
committer Nick Kralevich <nnk@google.com> Mon Nov 19 11:46:33 2012 -0800
tree 21c04e8b18b3a15e6503beae99f6573cc1915b72
parent 8784709a2cfe6d32b5fff2c6b826b8d9cbf73d7b

mmap: Remove madvise() workaround

Remove mmap() calling madvise(MADV_MERGEABLE) added
in b8e1e9685efc82d6ac112b9aa316e7f6bf5186ca

Change-Id: I80dbf6afe750348964d83097f993ea6cb8a065d5

libc/bionic/mmap.c

diff --git a/libc/bionic/mmap.c b/libc/bionic/mmap.c
index e097086..40a6538 100644
--- a/libc/bionic/mmap.c
+++ b/libc/bionic/mmap.c
@@ -34,17 +34,10 @@
 #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;
     }
 
-    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;
+    return __mmap2(addr, size, prot, flags, fd, (size_t)offset >> MMAP2_SHIFT);
 }