Merge branch 'topic/azt3328' into for-linus

[pandora-kernel.git] / arch / mips / dec / kn02xa-berr.c

diff --git a/arch/mips/dec/kn02xa-berr.c b/arch/mips/dec/kn02xa-berr.c
index 6cd3f94..07ca540 100644 (file)
--- a/arch/mips/dec/kn02xa-berr.c
+++ b/arch/mips/dec/kn02xa-berr.c
@@ -1,6 +1,4 @@
 /*
- *     linux/arch/mips/dec/kn02xa-berr.c
- *
  *     Bus error event handling code for 5000-series systems equipped
  *     with parity error detection logic, i.e. DECstation/DECsystem
  *     5000/120, /125, /133 (KN02-BA), 5000/150 (KN04-BA) and Personal
@@ -21,6 +19,8 @@
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
+#include <asm/irq_regs.h>
+#include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 
@@ -104,9 +104,9 @@ int dec_kn02xa_be_handler(struct pt_regs *regs, int is_fixup)
        return dec_kn02xa_be_backend(regs, is_fixup, 0);
 }
 
-irqreturn_t dec_kn02xa_be_interrupt(int irq, void *dev_id,
-                                   struct pt_regs *regs)
+irqreturn_t dec_kn02xa_be_interrupt(int irq, void *dev_id)
 {
+       struct pt_regs *regs = get_irq_regs();
        int action = dec_kn02xa_be_backend(regs, 0, 1);
 
        if (action == MIPS_BE_DISCARD)
@@ -130,7 +130,7 @@ void __init dec_kn02xa_be_init(void)
        volatile u32 *mbcs = (void *)CKSEG1ADDR(KN4K_SLOT_BASE + KN4K_MB_CSR);
 
         /* For KN04 we need to make sure EE (?) is enabled in the MB.  */
-        if (current_cpu_data.cputype == CPU_R4000SC)
+        if (current_cpu_type() == CPU_R4000SC)
                *mbcs |= KN4K_MB_CSR_EE;
        fast_iob();