commit ff0261e6d7641a4e2bcf5930ac703023b96c8f4c
author Pete Delaney <piet.delaney@imgtec.com> Thu Jan 09 12:07:43 2014 -0800
committer Chris Dearman <chris.dearman@imgtec.com> Thu Jan 09 12:18:54 2014 -0800
tree 75d4b9fef7efca3ce7dc4e4358da7e90b828f735
parent d907de554036cc37444b914725510b458ed545b3

Use MAP_FIXED in remapNewHeap

The heap address must not change when it is remapped

Change-Id: Ia44f178932e2afe8de3d4739e7085caae8568885
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>

vm/alloc/HeapSource.cpp

diff --git a/vm/alloc/HeapSource.cpp b/vm/alloc/HeapSource.cpp
index 22de1b5..aca05c2 100644
--- a/vm/alloc/HeapSource.cpp
+++ b/vm/alloc/HeapSource.cpp
@@ -402,7 +402,7 @@
     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, fd, 0);
+  void* addr = mmap(newHeapBase, rem_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, 0);
   int ret = close(fd);
   if (addr == MAP_FAILED) {
     ALOGE("Unable to map an ashmem region for the new heap");