diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:32:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 15:32:52 -0400 |
| commit | e4856a70cfc23266631a78e78277cf2b195babee (patch) | |
| tree | e163aa148bf6ec00e1506a870adf3aeabf083f52 /arch/powerpc | |
| parent | d1b5726358ccebcf614fc9f97cdf3354178dcb80 (diff) | |
| parent | 0b59268285ca6cdc46191f2995bf632088e3e277 (diff) | |
Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/elf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 64c6ee22eefd..d812929390e4 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h | |||
| @@ -232,7 +232,7 @@ typedef elf_vrregset_t elf_fpxregset_t; | |||
| 232 | #endif /* __powerpc64__ */ | 232 | #endif /* __powerpc64__ */ |
| 233 | 233 | ||
| 234 | #ifdef __powerpc64__ | 234 | #ifdef __powerpc64__ |
| 235 | # define SET_PERSONALITY(ex, ibcs2) \ | 235 | # define SET_PERSONALITY(ex) \ |
| 236 | do { \ | 236 | do { \ |
| 237 | unsigned long new_flags = 0; \ | 237 | unsigned long new_flags = 0; \ |
| 238 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ | 238 | if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ |
| @@ -256,7 +256,7 @@ do { \ | |||
| 256 | # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \ | 256 | # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \ |
| 257 | (exec_stk != EXSTACK_DISABLE_X) : 0) | 257 | (exec_stk != EXSTACK_DISABLE_X) : 0) |
| 258 | #else | 258 | #else |
| 259 | # define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 259 | # define SET_PERSONALITY(ex) set_personality(PER_LINUX) |
| 260 | #endif /* __powerpc64__ */ | 260 | #endif /* __powerpc64__ */ |
| 261 | 261 | ||
| 262 | extern int dcache_bsize; | 262 | extern int dcache_bsize; |