commit 6b63e6c5d3ab76ee72fb9aace44d2717f5989fbf
author Nick Kralevich <nnk@google.com> Fri Oct 19 12:59:28 2012 -0700
committer Nick Kralevich <nnk@google.com> Fri Oct 19 12:59:28 2012 -0700
tree 3420338f3dbc8d3718dc289435055d284a817886
parent 5b9e7cea83d19034c015dd241a45b5c4f1f1b08e

Revise previous patch based on feedback.

Change-Id: Ica39399d35c961e13cf401784ce024b6f85fe00a

vm/native/dalvik_system_Zygote.cpp

diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index cb8172f..f893889 100644
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@ -481,8 +481,10 @@
 #endif
 }
 
-#ifdef __arm__
 static bool needsNoRandomizeWorkaround() {
+#if !defined(__arm__)
+    return false;
+#else
     int major;
     int minor;
     struct utsname uts;
@@ -496,8 +498,8 @@
 
     // Kernels before 3.4.* need the workaround.
     return (major < 3) || ((major == 3) && (minor < 4));
-}
 #endif
+}
 
 /*
  * Utility routine to fork zygote and specialize the child process.
@@ -625,7 +627,6 @@
             dvmAbort();
         }
 
-#ifdef __arm__
         if (needsNoRandomizeWorkaround()) {
             int current = personality(0xffffFFFF);
             int success = personality((ADDR_NO_RANDOMIZE | current));
@@ -633,7 +634,6 @@
                 ALOGW("Personality switch failed. current=%d error=%d\n", current, errno);
             }
         }
-#endif
 
         err = setCapabilities(permittedCapabilities, effectiveCapabilities);
         if (err != 0) {