patch-2.4.10 linux/arch/ppc/kernel/traps.c
Next file: linux/arch/ppc/lib/checksum.S
Previous file: linux/arch/ppc/kernel/time.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
Tue Aug 28 06:58:33 2001
- Orig file:
v2.4.9/linux/arch/ppc/kernel/traps.c
- Orig date:
Mon Aug 27 12:41:39 2001
diff -u --recursive --new-file v2.4.9/linux/arch/ppc/kernel/traps.c linux/arch/ppc/kernel/traps.c
@@ -1,5 +1,5 @@
/*
- * BK Id: SCCS/s.traps.c 1.16 07/31/01 10:53:34 trini
+ * BK Id: SCCS/s.traps.c 1.19 08/24/01 20:07:37 paulus
*/
/*
* linux/arch/ppc/kernel/traps.c
@@ -244,7 +244,7 @@
*/
if ((instword & INST_MFSPR_PVR_MASK) == INST_MFSPR_PVR) {
rd = (instword >> 21) & 0x1f;
- regs->gpr[rd] = _get_PVR();
+ regs->gpr[rd] = mfspr(PVR);
retval = 0;
}
if (retval == 0)
@@ -372,12 +372,14 @@
}
#endif
+#if !defined(CONFIG_TAU_INT)
void
TAUException(struct pt_regs *regs)
{
printk("TAU trap at PC: %lx, SR: %lx, vector=%lx\n",
regs->nip, regs->msr, regs->trap);
}
+#endif /* CONFIG_INT_TAU */
void __init trap_init(void)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)