diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /arch/ia64/ia32/binfmt_elf32.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/ia64/ia32/binfmt_elf32.c')
| -rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 4e7a6a1ec6c7..da03c06744f1 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
| @@ -35,6 +35,9 @@ extern void ia64_elf32_init (struct pt_regs *regs); | |||
| 35 | 35 | ||
| 36 | static void elf32_set_personality (void); | 36 | static void elf32_set_personality (void); |
| 37 | 37 | ||
| 38 | static unsigned long __attribute ((unused)) | ||
| 39 | randomize_stack_top(unsigned long stack_top); | ||
| 40 | |||
| 38 | #define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec) | 41 | #define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec) |
| 39 | #define elf_map elf32_map | 42 | #define elf_map elf32_map |
| 40 | 43 | ||