Merge tag 'linux-watchdog-4.20-rc1' of git://www.linux-watchdog.org/linux-watchdog

[sfrench/cifs-2.6.git] / arch / unicore32 / mm / fault.c

diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c
index 8f12a5b50a42bffaa14efa03c04c8f6f67f8b1b1..b9a3a50644c1050e180626c8779ae3bfa0c9f3ce 100644 (file)
--- a/arch/unicore32/mm/fault.c
+++ b/arch/unicore32/mm/fault.c
@@ -120,17 +120,10 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr,
                unsigned int fsr, unsigned int sig, int code,
                struct pt_regs *regs)
 {
-       struct siginfo si;
-
        tsk->thread.address = addr;
        tsk->thread.error_code = fsr;
        tsk->thread.trap_no = 14;
-       clear_siginfo(&si);
-       si.si_signo = sig;
-       si.si_errno = 0;
-       si.si_code = code;
-       si.si_addr = (void __user *)addr;
-       force_sig_info(sig, &si, tsk);
+       force_sig_fault(sig, code, (void __user *)addr, tsk);
 }
 
 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
@@ -466,7 +459,6 @@ asmlinkage void do_DataAbort(unsigned long addr, unsigned int fsr,
                        struct pt_regs *regs)
 {
        const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
-       struct siginfo info;
 
        if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
                return;
@@ -474,19 +466,14 @@ asmlinkage void do_DataAbort(unsigned long addr, unsigned int fsr,
        printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
               inf->name, fsr, addr);
 
-       clear_siginfo(&info);
-       info.si_signo = inf->sig;
-       info.si_errno = 0;
-       info.si_code = inf->code;
-       info.si_addr = (void __user *)addr;
-       uc32_notify_die("", regs, &info, fsr, 0);
+       uc32_notify_die("", regs, inf->sig, inf->code, (void __user *)addr,
+                       fsr, 0);
 }
 
 asmlinkage void do_PrefetchAbort(unsigned long addr,
                        unsigned int ifsr, struct pt_regs *regs)
 {
        const struct fsr_info *inf = fsr_info + fsr_fs(ifsr);
-       struct siginfo info;
 
        if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
                return;
@@ -494,10 +481,6 @@ asmlinkage void do_PrefetchAbort(unsigned long addr,
        printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
               inf->name, ifsr, addr);
 
-       clear_siginfo(&info);
-       info.si_signo = inf->sig;
-       info.si_errno = 0;
-       info.si_code = inf->code;
-       info.si_addr = (void __user *)addr;
-       uc32_notify_die("", regs, &info, ifsr, 0);
+       uc32_notify_die("", regs, inf->sig, inf->code, (void __user *)addr,
+                       ifsr, 0);
 }