diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:32:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:32:52 -0700 |
commit | e4856a70cfc23266631a78e78277cf2b195babee (patch) | |
tree | e163aa148bf6ec00e1506a870adf3aeabf083f52 /arch/ia64/ia32/ia32priv.h | |
parent | d1b5726358ccebcf614fc9f97cdf3354178dcb80 (diff) | |
parent | 0b59268285ca6cdc46191f2995bf632088e3e277 (diff) | |
download | talos-op-linux-e4856a70cfc23266631a78e78277cf2b195babee.tar.gz talos-op-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/ia64/ia32/ia32priv.h')
-rw-r--r-- | arch/ia64/ia32/ia32priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h index dd0c53687a96..0f15349c3c6b 100644 --- a/arch/ia64/ia32/ia32priv.h +++ b/arch/ia64/ia32/ia32priv.h @@ -332,8 +332,8 @@ void ia64_elf32_init(struct pt_regs *regs); #define ELF_PLATFORM NULL #ifdef __KERNEL__ -# define SET_PERSONALITY(EX,IBCS2) \ - (current->personality = (IBCS2) ? PER_SVR4 : PER_LINUX) +# define SET_PERSONALITY(EX) \ + (current->personality = PER_LINUX) #endif #define IA32_EFLAG 0x200 |