summaryrefslogtreecommitdiffstats
path: root/init/init.c
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-03-14 15:23:30 -0700
committerNick Kralevich <nnk@google.com>2013-03-14 15:23:30 -0700
commit76ba83cce2c375c9e3edaaad52fdcb916ebdd3c1 (patch)
tree168c1070994ffcda4bac6f34f79efce083f35e07 /init/init.c
parent3960ec226d07c7327ac6967a2977c521fd4884b6 (diff)
downloadcore-76ba83cce2c375c9e3edaaad52fdcb916ebdd3c1.tar.gz
core-76ba83cce2c375c9e3edaaad52fdcb916ebdd3c1.tar.bz2
core-76ba83cce2c375c9e3edaaad52fdcb916ebdd3c1.zip
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
This logic has been moved to platform/frameworks/base commit 8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed here. This reverts commit 01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.
Diffstat (limited to 'init/init.c')
-rwxr-xr-xinit/init.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/init/init.c b/init/init.c
index 48d855972..bfaf983b4 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>
#include <selinux/selinux.h>
#include <selinux/label.h>
@@ -242,21 +241,6 @@ void service_start(struct service *svc, const char *dynamic_args)
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);