ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes.""

Browse source 
* commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
This commit is contained in:
Nick Kralevich 2013-03-14 16:14:06 -07:00 • committed by Android Git Automerger
commit 9573a1755c
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init/init.c
View file

@ -31,7 +31,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <sys/personality.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
#include <selinux/label.h> #include <selinux/label.h>
@ -242,21 +241,6 @@ void service_start(struct service *svc, const char *dynamic_args)
int fd, sz; int fd, sz;
umask(077); 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()) { if (properties_inited()) {
get_property_workspace(&fd, &sz); get_property_workspace(&fd, &sz);
sprintf(tmp, "%d,%d", dup(fd), sz); sprintf(tmp, "%d,%d", dup(fd), sz);