diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
| commit | 775d71e49c65f1f6aa57776ea1da62988fc9a30a (patch) | |
| tree | ce03cae544bacc8dda67422fd66a543dd1ae3c99 /arch/arm/kernel/elf.c | |
| parent | 18e82d2b952ab57fc1c8a69d4fa14e562f2aecf6 (diff) | |
| parent | c1a952f48517b5545075d8eb1a5d543099bd2ae1 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38KNOWN_GOOD
Diffstat (limited to 'arch/arm/kernel/elf.c')
| -rw-r--r-- | arch/arm/kernel/elf.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c index d4a0da1e48f..8524d096300 100644 --- a/arch/arm/kernel/elf.c +++ b/arch/arm/kernel/elf.c @@ -40,16 +40,23 @@ EXPORT_SYMBOL(elf_check_arch); void elf_set_personality(const struct elf32_hdr *x) { unsigned int eflags = x->e_flags; - unsigned int personality = PER_LINUX_32BIT; + unsigned int personality = current->personality; /* + * Inherit most personality flags from parent, except for those + * we're about to choose. Beware: PER_LINUX_32BIT carries flag bits + * outside of PER_MASK. + */ + personality &= ~(PER_MASK | PER_LINUX | PER_LINUX_32BIT); + + /* * APCS-26 is only valid for OABI executables */ - if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) { - if (eflags & EF_ARM_APCS_26) - personality = PER_LINUX; - } - + if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN && + (eflags & EF_ARM_APCS_26)) + personality |= PER_LINUX; + else + personality |= PER_LINUX_32BIT; set_personality(personality); /* |