aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2008-04-17 01:46:07 -0400
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-04-17 01:46:59 -0400
commitc2e8b8531b162fb314434f1f2608ba1ddf46b98f (patch)
tree1725b9b14a14ac98306cd4d9e9cd2dd1e94a0b6a
parenta695f16729e00995fe72baf0e8bee4bf9c232ae0 (diff)
[S390] exec_protect: Fix incorrect extern declarations.
sys_sigreturn and sys_rt_sigreturn don't take any arguments. So luckily this resulted only in unneeded instead of incorrect code. But still this clearly shows why one should not put extern declarations in C files (will be fixed with a larger sparse patch). Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-rw-r--r--arch/s390/mm/fault.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index ed13d429a487..a9c635f01db8 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -245,10 +245,10 @@ static void do_sigbus(struct pt_regs *regs, unsigned long error_code,
245} 245}
246 246
247#ifdef CONFIG_S390_EXEC_PROTECT 247#ifdef CONFIG_S390_EXEC_PROTECT
248extern long sys_sigreturn(struct pt_regs *regs); 248extern long sys_sigreturn(void);
249extern long sys_rt_sigreturn(struct pt_regs *regs); 249extern long sys_rt_sigreturn(void);
250extern long sys32_sigreturn(struct pt_regs *regs); 250extern long sys32_sigreturn(void);
251extern long sys32_rt_sigreturn(struct pt_regs *regs); 251extern long sys32_rt_sigreturn(void);
252 252
253static int signal_return(struct mm_struct *mm, struct pt_regs *regs, 253static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
254 unsigned long address, unsigned long error_code) 254 unsigned long address, unsigned long error_code)
@@ -270,15 +270,15 @@ static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
270#ifdef CONFIG_COMPAT 270#ifdef CONFIG_COMPAT
271 compat = test_tsk_thread_flag(current, TIF_31BIT); 271 compat = test_tsk_thread_flag(current, TIF_31BIT);
272 if (compat && instruction == 0x0a77) 272 if (compat && instruction == 0x0a77)
273 sys32_sigreturn(regs); 273 sys32_sigreturn();
274 else if (compat && instruction == 0x0aad) 274 else if (compat && instruction == 0x0aad)
275 sys32_rt_sigreturn(regs); 275 sys32_rt_sigreturn();
276 else 276 else
277#endif 277#endif
278 if (instruction == 0x0a77) 278 if (instruction == 0x0a77)
279 sys_sigreturn(regs); 279 sys_sigreturn();
280 else if (instruction == 0x0aad) 280 else if (instruction == 0x0aad)
281 sys_rt_sigreturn(regs); 281 sys_rt_sigreturn();
282 else { 282 else {
283 current->thread.prot_addr = address; 283 current->thread.prot_addr = address;
284 current->thread.trap_no = error_code; 284 current->thread.trap_no = error_code;