git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
elf_64.h
diff --git
a/arch/sparc/include/asm/elf_64.h
b/arch/sparc/include/asm/elf_64.h
index
425c2f9
..
d42e393
100644
(file)
--- 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 */ \
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) */
} while (0)
#endif /* !(__ASM_SPARC64_ELF_H) */