[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 <schwidefsky@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 8b2dda88330799fd4eecca2e9b0f763458c36b36..b5d5ae7a0ada50ab9889a530afa8396ea4219811 100644 (file)
--- 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;
        }