diff options
| author | Linus Torvalds | 2008-10-16 21:32:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-16 21:32:52 +0200 |
| commit | e4856a70cfc23266631a78e78277cf2b195babee (patch) | |
| tree | e163aa148bf6ec00e1506a870adf3aeabf083f52 /arch/mips | |
| parent | Merge branch 'docs' of git://git.lwn.net/linux-2.6 (diff) | |
| parent | [PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY (diff) | |
| download | kernel-qcow2-linux-e4856a70cfc23266631a78e78277cf2b195babee.tar.gz kernel-qcow2-linux-e4856a70cfc23266631a78e78277cf2b195babee.tar.xz kernel-qcow2-linux-e4856a70cfc23266631a78e78277cf2b195babee.zip | |
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/mips')
| -rw-r--r-- | arch/mips/include/asm/elf.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h index f69f7acba637..a8eac1697b3d 100644 --- a/arch/mips/include/asm/elf.h +++ b/arch/mips/include/asm/elf.h @@ -247,10 +247,8 @@ extern struct mips_abi mips_abi_n32; #ifdef CONFIG_32BIT -#define SET_PERSONALITY(ex, ibcs2) \ +#define SET_PERSONALITY(ex) \ do { \ - if (ibcs2) \ - set_personality(PER_SVR4); \ set_personality(PER_LINUX); \ \ current->thread.abi = &mips_abi; \ @@ -296,7 +294,7 @@ do { \ #define __SET_PERSONALITY32(ex) do { } while (0) #endif -#define SET_PERSONALITY(ex, ibcs2) \ +#define SET_PERSONALITY(ex) \ do { \ clear_thread_flag(TIF_32BIT_REGS); \ clear_thread_flag(TIF_32BIT_ADDR); \ @@ -306,9 +304,7 @@ do { \ else \ current->thread.abi = &mips_abi; \ \ - if (ibcs2) \ - set_personality(PER_SVR4); \ - else if (current->personality != PER_LINUX32) \ + if (current->personality != PER_LINUX32) \ set_personality(PER_LINUX); \ } while (0) |