From 03f4b54123d75edfbdd0e5afdb5802dafc1d2358 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Thu, 26 Aug 2004 20:49:37 -0700 Subject: [PATCH] [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: Martin Schwidefsky Signed-off-by: Linus Torvalds --- arch/s390/mm/fault.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 8b2dda8833079..b5d5ae7a0ada5 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -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 @@ bad_area: 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; } -- 2.53.0