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/ia64/ia32 | |
| 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/ia64/ia32')
| -rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 2 | ||||
| -rw-r--r-- | arch/ia64/ia32/ia32priv.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 4f0c30c38e99..f92bdaac8976 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
| @@ -41,7 +41,7 @@ randomize_stack_top(unsigned long stack_top); | |||
| 41 | #define elf_map elf32_map | 41 | #define elf_map elf32_map |
| 42 | 42 | ||
| 43 | #undef SET_PERSONALITY | 43 | #undef SET_PERSONALITY |
| 44 | #define SET_PERSONALITY(ex, ibcs2) elf32_set_personality() | 44 | #define SET_PERSONALITY(ex) elf32_set_personality() |
| 45 | 45 | ||
| 46 | #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) | 46 | #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) |
| 47 | 47 | ||
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); | |||
| 332 | #define ELF_PLATFORM NULL | 332 | #define ELF_PLATFORM NULL |
| 333 | 333 | ||
| 334 | #ifdef __KERNEL__ | 334 | #ifdef __KERNEL__ |
| 335 | # define SET_PERSONALITY(EX,IBCS2) \ | 335 | # define SET_PERSONALITY(EX) \ |
| 336 | (current->personality = (IBCS2) ? PER_SVR4 : PER_LINUX) | 336 | (current->personality = PER_LINUX) |
| 337 | #endif | 337 | #endif |
| 338 | 338 | ||
| 339 | #define IA32_EFLAG 0x200 | 339 | #define IA32_EFLAG 0x200 |