diff options
| author | Nick Kralevich <nnk@google.com> | 2013-03-14 16:14:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-14 16:14:06 -0700 |
| commit | 9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4 (patch) | |
| tree | 0442b847156bacf8908c26b7ce5e5943b6fe75e8 /init/init.c | |
| parent | 1d77e6e4e3d304f86d0cfa2cfcf5266192420cae (diff) | |
| parent | dbf4937b5a1ef4ceed49e13527f50514c510ebd4 (diff) | |
| download | system_core-9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4.zip system_core-9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4.tar.gz system_core-9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4.tar.bz2 | |
am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""
* commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4':
Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
Diffstat (limited to 'init/init.c')
| -rwxr-xr-x | init/init.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/init/init.c b/init/init.c index 48d8559..bfaf983 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); |