aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-04-30 20:34:29 +0100
committerLorDClockaN <davor@losinj.com>2014-05-01 08:35:15 +0200
commit3f3e58fbe3eb8ff0f689649e7ce088ff70428d8a (patch)
tree5a321599f61968cf5c99436828272b495bd09302
parent9515dedb242f6bf1848d4b9c493b2455f5005dea (diff)
Revert "Use MAP_FIXED in remapNewHeap"
This reverts commit 462bc921aefe3b96e8cc7dae91e234b0e455966c, it breaks android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingFast Change-Id: Ic153994859f678dbef4328bee5740e21beb735e0
-rw-r--r--vm/alloc/HeapSource.cpp2
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");