aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavor Bertovic <davor@losinj.com>2014-03-30 06:01:23 -0400
committerDavor Bertovic <davor@losinj.com>2014-03-30 06:01:23 -0400
commit95d2bc928952165cd84aa0c5fe5f572b7ec2c807 (patch)
tree85b7aa055f52f4fb9b8b07e91e99e8d3f6a5dee3
parent798643be51d789aec8f7ad6c7dfb1ee01774babb (diff)
Revert "Use MAP_FIXED in remapNewHeap"
This reverts commit 798643be51d789aec8f7ad6c7dfb1ee01774babb. Change-Id: I07a2ac84028b8b9c14f69a9452e83560b22933b8
-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");