From 3f3e58fbe3eb8ff0f689649e7ce088ff70428d8a Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Wed, 30 Apr 2014 20:34:29 +0100 Subject: Revert "Use MAP_FIXED in remapNewHeap" This reverts commit 462bc921aefe3b96e8cc7dae91e234b0e455966c, it breaks android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingFast Change-Id: Ic153994859f678dbef4328bee5740e21beb735e0 --- vm/alloc/HeapSource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v1.2.3