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

am 60fb6833: Merge "mmap: Remove madvise() workaround"

Browse Source 
* commit '60fb68338b7541b6022fc343857b90c088c399cd':
  mmap: Remove madvise() workaround
This commit is contained in:
Elliott Hughes 2012-12-03 09:36:47 -08:00 committed by Android Git Automerger
commit 3960fb602c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/mmap.c
View File

@ -34,17 +34,10 @@ 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;
} }
ret = __mmap2(addr, size, prot, flags, fd, (size_t)offset >> MMAP2_SHIFT); return __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;
} }