summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-07 15:36:13 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-07 15:36:13 -0700
commitd3584183d2f40f40371e288ceef187d04da213b5 (patch)
treee49f88bd366a48e2bb431a0dbaaf48e18353421a /arch/sparc
parent956d039a2537cf79ca608450d36cc70e0e515482 (diff)
downloadop-kernel-dev-d3584183d2f40f40371e288ceef187d04da213b5.zip
op-kernel-dev-d3584183d2f40f40371e288ceef187d04da213b5.tar.gz
sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/elf_64.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index 425c2f9..d42e393 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -208,8 +208,9 @@ do { unsigned long new_flags = current_thread_info()->flags; \
else \
clear_thread_flag(TIF_ABI_PENDING); \
/* flush_thread will update pgd cache */ \
- if (current->personality != PER_LINUX32) \
- set_personality(PER_LINUX); \
+ if (personality(current->personality) != PER_LINUX32) \
+ set_personality(PER_LINUX | \
+ (current->personality & (~PER_MASK))); \
} while (0)
#endif /* !(__ASM_SPARC64_ELF_H) */
OpenPOWER on IntegriCloud