diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/elf.h | 2 | ||||
-rw-r--r-- | arch/sh/kernel/vsyscall/vsyscall.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index b809f22ea638..ccb1d93bb043 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h | |||
@@ -202,7 +202,7 @@ do { \ | |||
202 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES | 202 | #define ARCH_HAS_SETUP_ADDITIONAL_PAGES |
203 | struct linux_binprm; | 203 | struct linux_binprm; |
204 | extern int arch_setup_additional_pages(struct linux_binprm *bprm, | 204 | extern int arch_setup_additional_pages(struct linux_binprm *bprm, |
205 | int executable_stack); | 205 | int uses_interp); |
206 | 206 | ||
207 | extern unsigned int vdso_enabled; | 207 | extern unsigned int vdso_enabled; |
208 | extern void __kernel_vsyscall; | 208 | extern void __kernel_vsyscall; |
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c index 95f4de0800ec..3f7e415be86a 100644 --- a/arch/sh/kernel/vsyscall/vsyscall.c +++ b/arch/sh/kernel/vsyscall/vsyscall.c | |||
@@ -59,8 +59,7 @@ int __init vsyscall_init(void) | |||
59 | } | 59 | } |
60 | 60 | ||
61 | /* Setup a VMA at program startup for the vsyscall page */ | 61 | /* Setup a VMA at program startup for the vsyscall page */ |
62 | int arch_setup_additional_pages(struct linux_binprm *bprm, | 62 | int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) |
63 | int executable_stack) | ||
64 | { | 63 | { |
65 | struct mm_struct *mm = current->mm; | 64 | struct mm_struct *mm = current->mm; |
66 | unsigned long addr; | 65 | unsigned long addr; |