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/binfmt_elf32.c | |
| 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/binfmt_elf32.c')
| -rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 4f0c30c38e9..f92bdaac897 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); #define elf_map elf32_map #undef SET_PERSONALITY -#define SET_PERSONALITY(ex, ibcs2) elf32_set_personality() +#define SET_PERSONALITY(ex) elf32_set_personality() #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) |