diff options
| author | Pete Delaney <piet.delaney@imgtec.com> | 2014-01-09 12:07:43 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-02-02 02:15:43 -0800 |
| commit | 462bc921aefe3b96e8cc7dae91e234b0e455966c (patch) | |
| tree | 29333a0da0ac8a5e9e9369bbabb23f1735ea7eeb /vm | |
| parent | 5627e337bbfab398dacb50c7a1ca97783c76f089 (diff) | |
| download | android_dalvik-462bc921aefe3b96e8cc7dae91e234b0e455966c.tar.gz android_dalvik-462bc921aefe3b96e8cc7dae91e234b0e455966c.tar.bz2 android_dalvik-462bc921aefe3b96e8cc7dae91e234b0e455966c.zip | |
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>
Diffstat (limited to 'vm')
| -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 caf30af02..56d392ab3 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, 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"); |