Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / arch / arc / kernel / traps.c

diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c
index e9a5b25..6b83e3f 100644 (file)
--- a/arch/arc/kernel/traps.c
+++ b/arch/arc/kernel/traps.c
@@ -20,11 +20,6 @@
 #include <asm/unaligned.h>
 #include <asm/kprobes.h>
 
-void __init trap_init(void)
-{
-       return;
-}
-
 void die(const char *str, struct pt_regs *regs, unsigned long address)
 {
        show_kernel_fault_diag(str, regs, address);
@@ -47,7 +42,7 @@ unhandled_exception(const char *str, struct pt_regs *regs,
 
                tsk->thread.fault_address = (__force unsigned int)addr;
 
-               force_sig_fault(signo, si_code, addr, tsk);
+               force_sig_fault(signo, si_code, addr);
 
        } else {
                /* If not due to copy_(to|from)_user, we are doomed */