patch-2.4.21 linux-2.4.21/arch/sparc/kernel/traps.c

Next file: linux-2.4.21/arch/sparc/kernel/windows.c
Previous file: linux-2.4.21/arch/sparc/kernel/trampoline.S
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/arch/sparc/kernel/traps.c linux-2.4.21/arch/sparc/kernel/traps.c
@@ -152,6 +152,7 @@
 void do_illegal_instruction(struct pt_regs *regs, unsigned long pc, unsigned long npc,
 			    unsigned long psr)
 {
+	extern int do_user_muldiv (struct pt_regs *, unsigned long);
 	siginfo_t info;
 
 	if(psr & PSR_PS)
@@ -160,11 +161,9 @@
 	printk("Ill instr. at pc=%08lx instruction is %08lx\n",
 	       regs->pc, *(unsigned long *)regs->pc);
 #endif
-	if (sparc_cpu_model == sun4c || sparc_cpu_model == sun4) {
-		extern int do_user_muldiv (struct pt_regs *, unsigned long);
-		if (!do_user_muldiv (regs, pc))
-			return;
-	}
+	if (!do_user_muldiv (regs, pc))
+		return;
+
 	info.si_signo = SIGILL;
 	info.si_errno = 0;
 	info.si_code = ILL_ILLOPC;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)