diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/s390/include/asm/elf.h | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/s390/include/asm/elf.h')
| -rw-r--r-- | arch/s390/include/asm/elf.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h index d480f39d65e6..74d0bbb7d955 100644 --- a/arch/s390/include/asm/elf.h +++ b/arch/s390/include/asm/elf.h | |||
| @@ -172,14 +172,14 @@ extern char elf_platform[]; | |||
| 172 | #ifndef __s390x__ | 172 | #ifndef __s390x__ |
| 173 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX) | 173 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX) |
| 174 | #else /* __s390x__ */ | 174 | #else /* __s390x__ */ |
| 175 | #define SET_PERSONALITY(ex) \ | 175 | #define SET_PERSONALITY(ex) \ |
| 176 | do { \ | 176 | do { \ |
| 177 | if (current->personality != PER_LINUX32) \ | 177 | if (personality(current->personality) != PER_LINUX32) \ |
| 178 | set_personality(PER_LINUX); \ | 178 | set_personality(PER_LINUX); \ |
| 179 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ | 179 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ |
| 180 | set_thread_flag(TIF_31BIT); \ | 180 | set_thread_flag(TIF_31BIT); \ |
| 181 | else \ | 181 | else \ |
| 182 | clear_thread_flag(TIF_31BIT); \ | 182 | clear_thread_flag(TIF_31BIT); \ |
| 183 | } while (0) | 183 | } while (0) |
| 184 | #endif /* __s390x__ */ | 184 | #endif /* __s390x__ */ |
| 185 | 185 | ||