Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

[mv-sheeva.git] / arch / mips / dec / ecc-berr.c

diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c
index c8430c07355ed5c26da325ac7e0d79f1dc251e21..7abce661b90f7826b67c587c9c6c185fa9dc4eeb 100644 (file)
--- a/arch/mips/dec/ecc-berr.c
+++ b/arch/mips/dec/ecc-berr.c
@@ -1,6 +1,4 @@
 /*
- *     linux/arch/mips/dec/ecc-berr.c
- *
  *     Bus error event handling code for systems equipped with ECC
  *     handling logic, i.e. DECstation/DECsystem 5000/200 (KN02),
  *     5000/240 (KN03), 5000/260 (KN05) and DECsystem 5900 (KN03),
@@ -25,6 +23,7 @@
 #include <asm/cpu.h>
 #include <asm/irq_regs.h>
 #include <asm/processor.h>
+#include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 
@@ -262,7 +261,7 @@ static inline void dec_kn03_be_init(void)
         */
        *mcr = (*mcr & ~(KN03_MCR_DIAGCHK | KN03_MCR_DIAGGEN)) |
               KN03_MCR_CORRECT;
-       if (current_cpu_data.cputype == CPU_R4400SC)
+       if (current_cpu_type() == CPU_R4400SC)
                *mbcs |= KN4K_MB_CSR_EE;
        fast_iob();
 }