Commit 03f4b541 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds

[PATCH] s390: force_sigsegv name clash.

The recent signal fix broke s390 because of a name clash.
Rename the s390 arch function to do_sigsegv.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f9b0e4b2
No related merge requests found
......@@ -126,8 +126,8 @@ static inline int check_user_space(struct pt_regs *regs, int error_code)
* Send SIGSEGV to task. This is an external routine
* to keep the stack usage of do_page_fault small.
*/
static void force_sigsegv(struct pt_regs *regs, unsigned long error_code,
int si_code, unsigned long address)
static void do_sigsegv(struct pt_regs *regs, unsigned long error_code,
int si_code, unsigned long address)
{
struct siginfo si;
......@@ -282,7 +282,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection)
if (regs->psw.mask & PSW_MASK_PSTATE) {
tsk->thread.prot_addr = address;
tsk->thread.trap_no = error_code;
force_sigsegv(regs, error_code, si_code, address);
do_sigsegv(regs, error_code, si_code, address);
return;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment