Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / arch / mips / dec / kn02xa-berr.c

diff --git a/arch/mips/dec/kn02xa-berr.c b/arch/mips/dec/kn02xa-berr.c
index c2990956662801cb63ab458000b8eadf554a97ce..5f04545c3606da25d1054c743e139478e32e4929 100644 (file)
--- a/arch/mips/dec/kn02xa-berr.c
+++ b/arch/mips/dec/kn02xa-berr.c
@@ -20,6 +20,9 @@
 #include <linux/kernel.h>
 #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>
 
@@ -29,8 +32,8 @@
 
 static inline void dec_kn02xa_be_ack(void)
 {
-       volatile u32 *mer = (void *)KN02XA_MER;
-       volatile u32 *mem_intr = (void *)KN02XA_MEM_INTR;
+       volatile u32 *mer = (void *)CKSEG1ADDR(KN02XA_MER);
+       volatile u32 *mem_intr = (void *)CKSEG1ADDR(KN02XA_MEM_INTR);
 
        *mer = KN02CA_MER_INTR;         /* Clear errors; keep the ARC IRQ. */
        *mem_intr = 0;                  /* Any write clears the bus IRQ. */
@@ -40,8 +43,8 @@ static inline void dec_kn02xa_be_ack(void)
 static int dec_kn02xa_be_backend(struct pt_regs *regs, int is_fixup,
                                 int invoker)
 {
-       volatile u32 *kn02xa_mer = (void *)KN02XA_MER;
-       volatile u32 *kn02xa_ear = (void *)KN02XA_EAR;
+       volatile u32 *kn02xa_mer = (void *)CKSEG1ADDR(KN02XA_MER);
+       volatile u32 *kn02xa_ear = (void *)CKSEG1ADDR(KN02XA_EAR);
 
        static const char excstr[] = "exception";
        static const char intstr[] = "interrupt";
@@ -103,9 +106,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)
@@ -126,10 +129,10 @@ irqreturn_t dec_kn02xa_be_interrupt(int irq, void *dev_id,
 
 void __init dec_kn02xa_be_init(void)
 {
-       volatile u32 *mbcs = (void *)(KN4K_SLOT_BASE + KN4K_MB_CSR);
+       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();