git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
ia32
/
binfmt_elf32.c
diff --git
a/arch/ia64/ia32/binfmt_elf32.c
b/arch/ia64/ia32/binfmt_elf32.c
index 4f0c30c38e994c1ea188f811232ecc27f7b81be1..f92bdaac8976ecff13c9639743d8411289f5581f 100644
(file)
--- 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))