Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...

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

diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index f960c3f4ce47c36ea24dfa601dc82bf7a931cedd..96add1427a75a5790acd3add530f33422c0808d9 100644 (file)
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -169,7 +169,7 @@ bad_area:
        up_read(&mm->mmap_sem);
        /* User mode accesses just cause a SIGSEGV */
        if (user_mode(regs)) {
-               do_trap(regs, SIGSEGV, code, addr, tsk);
+               do_trap(regs, SIGSEGV, code, addr);
                return;
        }
 
@@ -205,7 +205,7 @@ do_sigbus:
        /* Kernel mode? Handle exceptions or die */
        if (!user_mode(regs))
                goto no_context;
-       do_trap(regs, SIGBUS, BUS_ADRERR, addr, tsk);
+       do_trap(regs, SIGBUS, BUS_ADRERR, addr);
        return;
 
 vmalloc_fault:
@@ -219,7 +219,7 @@ vmalloc_fault:
 
                /* User mode accesses just cause a SIGSEGV */
                if (user_mode(regs))
-                       return do_trap(regs, SIGSEGV, code, addr, tsk);
+                       return do_trap(regs, SIGSEGV, code, addr);
 
                /*
                 * Synchronize this task's top level page-table