Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / arch / sparc / kernel / traps_32.c

diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 247a0d9..5630e5a 100644 (file)
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -102,8 +102,8 @@ void do_hw_interrupt(struct pt_regs *regs, unsigned long type)
        if(regs->psr & PSR_PS)
                die_if_kernel("Kernel bad trap", regs);
 
-       force_sig_fault(SIGILL, ILL_ILLTRP,
-                       (void __user *)regs->pc, type - 0x80);
+       force_sig_fault_trapno(SIGILL, ILL_ILLTRP,
+                              (void __user *)regs->pc, type - 0x80);
 }
 
 void do_illegal_instruction(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -116,7 +116,7 @@ void do_illegal_instruction(struct pt_regs *regs, unsigned long pc, unsigned lon
               regs->pc, *(unsigned long *)regs->pc);
 #endif
 
-       send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_ILLOPC, (void __user *)pc, current);
 }
 
 void do_priv_instruction(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -124,7 +124,7 @@ void do_priv_instruction(struct pt_regs *regs, unsigned long pc, unsigned long n
 {
        if(psr & PSR_PS)
                die_if_kernel("Penguin instruction from Penguin mode??!?!", regs);
-       send_sig_fault(SIGILL, ILL_PRVOPC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_PRVOPC, (void __user *)pc, current);
 }
 
 /* XXX User may want to be allowed to do this. XXX */
@@ -145,7 +145,7 @@ void do_memaccess_unaligned(struct pt_regs *regs, unsigned long pc, unsigned lon
 #endif
        send_sig_fault(SIGBUS, BUS_ADRALN,
                       /* FIXME: Should dig out mna address */ (void *)0,
-                      0, current);
+                      current);
 }
 
 static unsigned long init_fsr = 0x0UL;
@@ -291,7 +291,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                else if (fsr & 0x01)
                        code = FPE_FLTRES;
        }
-       send_sig_fault(SIGFPE, code, (void __user *)pc, 0, fpt);
+       send_sig_fault(SIGFPE, code, (void __user *)pc, fpt);
 #ifndef CONFIG_SMP
        last_task_used_math = NULL;
 #endif
@@ -305,7 +305,7 @@ void handle_tag_overflow(struct pt_regs *regs, unsigned long pc, unsigned long n
 {
        if(psr & PSR_PS)
                die_if_kernel("Penguin overflow trap from kernel mode", regs);
-       send_sig_fault(SIGEMT, EMT_TAGOVF, (void __user *)pc, 0, current);
+       send_sig_fault(SIGEMT, EMT_TAGOVF, (void __user *)pc, current);
 }
 
 void handle_watchpoint(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -327,13 +327,13 @@ void handle_reg_access(struct pt_regs *regs, unsigned long pc, unsigned long npc
        printk("Register Access Exception at PC %08lx NPC %08lx PSR %08lx\n",
               pc, npc, psr);
 #endif
-       force_sig_fault(SIGBUS, BUS_OBJERR, (void __user *)pc, 0);
+       force_sig_fault(SIGBUS, BUS_OBJERR, (void __user *)pc);
 }
 
 void handle_cp_disabled(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                        unsigned long psr)
 {
-       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, current);
 }
 
 void handle_cp_exception(struct pt_regs *regs, unsigned long pc, unsigned long npc,
@@ -343,13 +343,13 @@ void handle_cp_exception(struct pt_regs *regs, unsigned long pc, unsigned long n
        printk("Co-Processor Exception at PC %08lx NPC %08lx PSR %08lx\n",
               pc, npc, psr);
 #endif
-       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, 0, current);
+       send_sig_fault(SIGILL, ILL_COPROC, (void __user *)pc, current);
 }
 
 void handle_hw_divzero(struct pt_regs *regs, unsigned long pc, unsigned long npc,
                       unsigned long psr)
 {
-       send_sig_fault(SIGFPE, FPE_INTDIV, (void __user *)pc, 0, current);
+       send_sig_fault(SIGFPE, FPE_INTDIV, (void __user *)pc, current);
 }
 
 #ifdef CONFIG_DEBUG_BUGVERBOSE