commit 1af88c97432c88ec5b39d155e8c296d2a6eb1225
author David Turner <digit@android.com> Mon May 02 12:34:57 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 02 12:34:57 2011 -0700
tree 1d9be3b5daa03386ebc1b93af075600ec1ea1f28
parent 4b3b89ec763899390b15461dd6617bb4ed6fe846
parent d004dc9957cd8944d3db8ed92544c8ee65b117ca

am d004dc99: Merge "Use MAP_FIXED when allocating prelinked shared library regions"

* commit 'd004dc9957cd8944d3db8ed92544c8ee65b117ca':
  Use MAP_FIXED when allocating prelinked shared library regions

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index 5a9dccf..e350d89 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -822,7 +822,7 @@
 static int reserve_mem_region(soinfo *si)
 {
     void *base = mmap((void *)si->base, si->size, PROT_READ | PROT_EXEC,
-                      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                      MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (base == MAP_FAILED) {
         DL_ERR("%5d can NOT map (%sprelinked) library '%s' at 0x%08x "
               "as requested, will try general pool: %d (%s)",