diff options
Diffstat (limited to 'arch/sparc/include/asm')
-rw-r--r-- | arch/sparc/include/asm/elf_32.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/elf_64.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h index b7ab60547827..381a1b5256d6 100644 --- a/arch/sparc/include/asm/elf_32.h +++ b/arch/sparc/include/asm/elf_32.h | |||
@@ -137,6 +137,6 @@ typedef struct { | |||
137 | 137 | ||
138 | #define ELF_PLATFORM (NULL) | 138 | #define ELF_PLATFORM (NULL) |
139 | 139 | ||
140 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 140 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX) |
141 | 141 | ||
142 | #endif /* !(__ASMSPARC_ELF_H) */ | 142 | #endif /* !(__ASMSPARC_ELF_H) */ |
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h index 0818a1308f4e..425c2f9be6d5 100644 --- a/arch/sparc/include/asm/elf_64.h +++ b/arch/sparc/include/asm/elf_64.h | |||
@@ -195,7 +195,7 @@ static inline unsigned int sparc64_elf_hwcap(void) | |||
195 | 195 | ||
196 | #define ELF_PLATFORM (NULL) | 196 | #define ELF_PLATFORM (NULL) |
197 | 197 | ||
198 | #define SET_PERSONALITY(ex, ibcs2) \ | 198 | #define SET_PERSONALITY(ex) \ |
199 | do { unsigned long new_flags = current_thread_info()->flags; \ | 199 | do { unsigned long new_flags = current_thread_info()->flags; \ |
200 | new_flags &= _TIF_32BIT; \ | 200 | new_flags &= _TIF_32BIT; \ |
201 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ | 201 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ |
@@ -208,9 +208,7 @@ do { unsigned long new_flags = current_thread_info()->flags; \ | |||
208 | else \ | 208 | else \ |
209 | clear_thread_flag(TIF_ABI_PENDING); \ | 209 | clear_thread_flag(TIF_ABI_PENDING); \ |
210 | /* flush_thread will update pgd cache */ \ | 210 | /* flush_thread will update pgd cache */ \ |
211 | if (ibcs2) \ | 211 | if (current->personality != PER_LINUX32) \ |
212 | set_personality(PER_SVR4); \ | ||
213 | else if (current->personality != PER_LINUX32) \ | ||
214 | set_personality(PER_LINUX); \ | 212 | set_personality(PER_LINUX); \ |
215 | } while (0) | 213 | } while (0) |
216 | 214 | ||