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

Merge "mmap: Don't call madvise if mmap fails"

Browse Source
This commit is contained in:
Nick Kralevich
2013-07-02 19:52:43 +00:00
committed by Android (Google) Code Review
parent 2aac0fcc20 553a5ec407
commit e4723161d5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/mmap.c
View File

@@ -43,8 +43,9 @@ void* mmap(void *addr, size_t size, int prot, int flags, int fd, long offset)
ret = __mmap2(addr, size, prot, flags, fd, (size_t)offset >> MMAP2_SHIFT);
if (ret && (flags & (MAP_PRIVATE | MAP_ANONYMOUS)))
madvise(ret, size, MADV_MERGEABLE);
if ((ret != MAP_FAILED) && (flags & (MAP_PRIVATE | MAP_ANONYMOUS))) {
madvise(ret, size, MADV_MERGEABLE);
}
return ret;
}