From: Selim Gurun <sgurun@google.com>
Date: Fri, 13 Jan 2012 20:18:57 +0000 (-0800)
Subject: am ca5d7a30: am 311886c6: Prevent memory fragmentation.
X-Git-Tag: android-x86-4.4-r1~385
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ca52fa214401574887cc5c1a49abbe5b818ec28;p=android-x86%2Fdalvik.git

am ca5d7a30: am 311886c6: Prevent memory fragmentation.

* commit 'ca5d7a300ecb8a96c5751796dff62b007c7095b1':
  Prevent memory fragmentation.
---

6ca52fa214401574887cc5c1a49abbe5b818ec28
diff --cc vm/native/dalvik_system_Zygote.cpp
index 4e71e4fb4,2d66cef6a..cbc63030e
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@@ -446,9 -447,15 +447,15 @@@ static pid_t forkAndSpecializeCommon(co
              dvmAbort();
          }
  
+         int current = personality(0xffffFFFF);
+         int success = personality((ADDR_NO_RANDOMIZE | current));
+         if (success == -1) {
+           LOGW("Personality switch failed. current=%d error=%d\n", current, errno);
+         }
+ 
          err = setCapabilities(permittedCapabilities, effectiveCapabilities);
          if (err != 0) {
 -            LOGE("cannot set capabilities (%llx,%llx): %s",
 +            ALOGE("cannot set capabilities (%llx,%llx): %s",
                  permittedCapabilities, effectiveCapabilities, strerror(err));
              dvmAbort();
          }