signal/x86: Replace force_sig_info_fault with force_sig_fault

Now that the pkey handling has been removed force_sig_info_fault and
force_sig_fault perform identical work.  Just the type of the address
paramter is different.  So replace calls to force_sig_info_fault with
calls to force_sig_fault, and remove force_sig_info_fault.

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 75e9dce9241a201235448bf8aa55b51ea26459df..706af8cfd536665eee8b3930e23fba2ac0d42d34 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -153,21 +153,6 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
        return prefetch;
 }
 
-static void
-force_sig_info_fault(int si_signo, int si_code, unsigned long address,
-                    struct task_struct *tsk, u32 *pkey)
-{
-       siginfo_t info;
-
-       clear_siginfo(&info);
-       info.si_signo   = si_signo;
-       info.si_errno   = 0;
-       info.si_code    = si_code;
-       info.si_addr    = (void __user *)address;
-
-       force_sig_info(si_signo, &info, tsk);
-}
-
 DEFINE_SPINLOCK(pgd_lock);
 LIST_HEAD(pgd_list);
 
@@ -672,8 +657,8 @@ no_context(struct pt_regs *regs, unsigned long error_code,
                        tsk->thread.cr2 = address;
 
                        /* XXX: hwpoison faults will set the wrong code. */
-                       force_sig_info_fault(signal, si_code, address,
-                                            tsk, NULL);
+                       force_sig_fault(signal, si_code, (void __user *)address,
+                                       tsk);
                }
 
                /*
@@ -835,7 +820,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
                if (si_code == SEGV_PKUERR)
                        force_sig_pkuerr((void __user *)address, *pkey);
 
-               force_sig_info_fault(SIGSEGV, si_code, address, tsk, pkey);
+               force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk);
 
                return;
        }
@@ -963,7 +948,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
                return;
        }
 #endif
-       force_sig_info_fault(SIGBUS, BUS_ADRERR, address, tsk, NULL);
+       force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address, tsk);
 }
 
 static noinline void