diff options
| author | Davor Bertovic <davor@losinj.com> | 2014-03-30 06:01:27 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@doa.deadnet.net> | 2014-03-30 06:01:27 -0400 |
| commit | 636059bc4dfb6d24460b5f646a3039ed2b2db7e3 (patch) | |
| tree | 766b1103a54cf6c659070d6a4470d5787d3ce186 | |
| parent | 75c650017c2c27f73d49712eaba49a6508b775ed (diff) | |
| parent | 95d2bc928952165cd84aa0c5fe5f572b7ec2c807 (diff) | |
Merge "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 56d392ab3..caf30af02 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 | MAP_FIXED, fd, 0); + void* addr = mmap(newHeapBase, rem_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); int ret = close(fd); if (addr == MAP_FAILED) { ALOGE("Unable to map an ashmem region for the new heap"); |