1 files changed, 5 insertions, 12 deletions

diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c
index 9b05c6a0dce..d4a0da1e48f 100644
--- a/arch/arm/kernel/elf.c
+++ b/arch/arm/kernel/elf.c
@@ -40,22 +40,15 @@ EXPORT_SYMBOL(elf_check_arch);
 void elf_set_personality(const struct elf32_hdr *x)
 {
         unsigned int eflags = x->e_flags;
-        unsigned int personality = current->personality & ~PER_MASK;
-
-        /*
-         * We only support Linux ELF executables, so always set the
-         * personality to LINUX.
-         */
-        personality |= PER_LINUX;
+        unsigned int personality = PER_LINUX_32BIT;
 
         /*
          * APCS-26 is only valid for OABI executables
          */
-        if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN &&
-            (eflags & EF_ARM_APCS_26))
-                personality &= ~ADDR_LIMIT_32BIT;
-        else
-                personality |= ADDR_LIMIT_32BIT;
+        if ((eflags & EF_ARM_EABI_MASK) == EF_ARM_EABI_UNKNOWN) {
+                if (eflags & EF_ARM_APCS_26)
+                        personality = PER_LINUX;
+        }
 
         set_personality(personality);