aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/include/asm/traps.h1
-rw-r--r--arch/mips/kernel/traps.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/include/asm/traps.h b/arch/mips/include/asm/traps.h
index ff74aec3561a..420ca06b2f42 100644
--- a/arch/mips/include/asm/traps.h
+++ b/arch/mips/include/asm/traps.h
@@ -25,6 +25,7 @@ extern void (*board_nmi_handler_setup)(void);
25extern void (*board_ejtag_handler_setup)(void); 25extern void (*board_ejtag_handler_setup)(void);
26extern void (*board_bind_eic_interrupt)(int irq, int regset); 26extern void (*board_bind_eic_interrupt)(int irq, int regset);
27extern void (*board_ebase_setup)(void); 27extern void (*board_ebase_setup)(void);
28extern void (*board_cache_error_setup)(void);
28 29
29extern int register_nmi_notifier(struct notifier_block *nb); 30extern int register_nmi_notifier(struct notifier_block *nb);
30 31
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index cfdaaa4cffc0..ed46c2b6354c 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -91,7 +91,7 @@ void (*board_nmi_handler_setup)(void);
91void (*board_ejtag_handler_setup)(void); 91void (*board_ejtag_handler_setup)(void);
92void (*board_bind_eic_interrupt)(int irq, int regset); 92void (*board_bind_eic_interrupt)(int irq, int regset);
93void (*board_ebase_setup)(void); 93void (*board_ebase_setup)(void);
94 94void __cpuinitdata(*board_cache_error_setup)(void);
95 95
96static void show_raw_backtrace(unsigned long reg29) 96static void show_raw_backtrace(unsigned long reg29)
97{ 97{
@@ -1797,6 +1797,9 @@ void __init trap_init(void)
1797 1797
1798 set_except_vector(26, handle_dsp); 1798 set_except_vector(26, handle_dsp);
1799 1799
1800 if (board_cache_error_setup)
1801 board_cache_error_setup();
1802
1800 if (cpu_has_vce) 1803 if (cpu_has_vce)
1801 /* Special exception: R4[04]00 uses also the divec space. */ 1804 /* Special exception: R4[04]00 uses also the divec space. */
1802 memcpy((void *)(ebase + 0x180), &except_vec3_r4000, 0x100); 1805 memcpy((void *)(ebase + 0x180), &except_vec3_r4000, 0x100);