lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] exec_protect: Fix incorrect extern declarations.

Browse Source 
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>
This commit is contained in:
Heiko Carstens
2008-04-17 07:46:07 +02:00
parent a695f16729
commit c2e8b8531b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/s390/mm/fault.c
View File

@@ -245,10 +245,10 @@ static void do_sigbus(struct pt_regs *regs, unsigned long error_code,
} }
#ifdef CONFIG_S390_EXEC_PROTECT #ifdef CONFIG_S390_EXEC_PROTECT
extern long sys_sigreturn(struct pt_regs *regs); extern long sys_sigreturn(void);
extern long sys_rt_sigreturn(struct pt_regs *regs); extern long sys_rt_sigreturn(void);
extern long sys32_sigreturn(struct pt_regs *regs); extern long sys32_sigreturn(void);
extern long sys32_rt_sigreturn(struct pt_regs *regs); extern long sys32_rt_sigreturn(void);
static int signal_return(struct mm_struct *mm, struct pt_regs *regs, static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
unsigned long address, unsigned long error_code) unsigned long address, unsigned long error_code)
@@ -270,15 +270,15 @@ static int signal_return(struct mm_struct *mm, struct pt_regs *regs,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
compat = test_tsk_thread_flag(current, TIF_31BIT); compat = test_tsk_thread_flag(current, TIF_31BIT);
if (compat && instruction == 0x0a77) if (compat && instruction == 0x0a77)
sys32_sigreturn(regs); sys32_sigreturn();
else if (compat && instruction == 0x0aad) else if (compat && instruction == 0x0aad)
sys32_rt_sigreturn(regs); sys32_rt_sigreturn();
else else
#endif #endif
if (instruction == 0x0a77) if (instruction == 0x0a77)
sys_sigreturn(regs); sys_sigreturn();
else if (instruction == 0x0aad) else if (instruction == 0x0aad)
sys_rt_sigreturn(regs); sys_rt_sigreturn();
else { else {
current->thread.prot_addr = address; current->thread.prot_addr = address;
current->thread.trap_no = error_code; current->thread.trap_no = error_code;