commit 87980b5c9fab12737196b8505e948186a210d96e
author Nick Kralevich <nnk@google.com> Fri Oct 05 12:44:38 2012 -0700
committer Nick Kralevich <nnk@google.com> Fri Oct 05 12:45:05 2012 -0700
tree a64b057de7bc4a731fac895b5bf8f42fb91d9cd4
parent 00b7cefaf63042041ba7c82a3ebcbeec6f8ce3d7

Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."

This reverts commit 01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.

Bug: 7188322
Change-Id: Ia159eab36e9e7373f470d20a3796b63868ea5689

init/init.c

diff --git a/init/init.c b/init/init.c
index 1c80d9c..6127fd3 100755
--- a/init/init.c
+++ b/init/init.c
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/personality.h>
 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
@@ -243,21 +242,6 @@
         int fd, sz;
 
         umask(077);
-#ifdef __arm__
-        /*
-         * b/7188322 - Temporarily revert to the compat memory layout
-         * to avoid breaking third party apps.
-         *
-         * THIS WILL GO AWAY IN A FUTURE ANDROID RELEASE.
-         *
-         * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7dbaa466
-         * changes the kernel mapping from bottom up to top-down.
-         * This breaks some programs which improperly embed
-         * an out of date copy of Android's linker.
-         */
-        int current = personality(0xffffFFFF);
-        personality(current | ADDR_COMPAT_LAYOUT);
-#endif
         if (properties_inited()) {
             get_property_workspace(&fd, &sz);
             sprintf(tmp, "%d,%d", dup(fd), sz);