generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'b7b36b819e8029a152859f3204ba2da38a0e2879':
  mmap: Reinstate passing MADV_MERGEABLE on private anonymous maps
This commit is contained in:
Elliott Hughes 2013-07-17 13:05:13 -07:00 committed by Android Git Automerger
commit 4763ef2b5b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/mmap.c
View File

@ -34,10 +34,17 @@ extern void* __mmap2(void*, size_t, int, int, int, size_t);
#define MMAP2_SHIFT 12 #define MMAP2_SHIFT 12
void* mmap(void *addr, size_t size, int prot, int flags, int fd, long offset) void* mmap(void *addr, size_t size, int prot, int flags, int fd, long offset)
{ {
void *ret;
if (offset & ((1UL << MMAP2_SHIFT)-1)) { if (offset & ((1UL << MMAP2_SHIFT)-1)) {
errno = EINVAL; errno = EINVAL;
return MAP_FAILED; 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;
} }