diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-04-30 20:34:29 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-04-30 20:35:10 +0100 |
| commit | 052e0b411754d99a713ef6383e3417a19c371f6a (patch) | |
| tree | 5d3ff4ca65eb3242057e8a2b8593b9bd64b8b2d9 | |
| parent | 05184b0017e80edd52fbe80c920b366e071efae1 (diff) | |
| download | android_dalvik-052e0b411754d99a713ef6383e3417a19c371f6a.tar.gz android_dalvik-052e0b411754d99a713ef6383e3417a19c371f6a.tar.bz2 android_dalvik-052e0b411754d99a713ef6383e3417a19c371f6a.zip | |
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.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"); |