diff options
| author | Davor Bertovic <davor@losinj.com> | 2014-04-01 11:19:08 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@doa.deadnet.net> | 2014-04-01 11:19:08 -0400 |
| commit | 626bcc98f2c4c1ca94934010cc72935c29476b03 (patch) | |
| tree | f47070333d30cf700d45d6fd7f978df39ba35d0f | |
| parent | 27a5ff71e1ef52f195122b5d56968a280ffd8052 (diff) | |
| parent | c3d5000b5b3fd6144d405838b991d506762076b6 (diff) | |
Merge "Revert "Revert "Use MAP_FIXED in remapNewHeap""" into kitkat
| -rw-r--r-- | vm/alloc/HeapSource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/alloc/HeapSource.cpp b/vm/alloc/HeapSource.cpp index caf30af02..56d392ab3 100644 --- a/vm/alloc/HeapSource.cpp +++ b/vm/alloc/HeapSource.cpp @@ -414,7 +414,7 @@ static bool remapNewHeap(HeapSource* hs, Heap* newHeap) ALOGE("Unable to create an ashmem region for the new heap"); return false; } - void* addr = mmap(newHeapBase, rem_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + void* addr = mmap(newHeapBase, rem_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, 0); int ret = close(fd); if (addr == MAP_FAILED) { ALOGE("Unable to map an ashmem region for the new heap"); |