2010-03-03 11:40:17 +02:00
|
|
|
--- a/arch/mips/kernel/traps.c
|
|
|
|
|
+++ b/arch/mips/kernel/traps.c
|
2010-02-28 18:33:15 +02:00
|
|
|
@@ -50,6 +50,7 @@
|
|
|
|
|
#include <asm/types.h>
|
|
|
|
|
#include <asm/stacktrace.h>
|
|
|
|
|
#include <asm/irq.h>
|
|
|
|
|
+#include <asm/time.h>
|
|
|
|
|
|
|
|
|
|
extern void check_wait(void);
|
|
|
|
|
extern asmlinkage void r4k_wait(void);
|
2010-03-03 11:40:17 +02:00
|
|
|
@@ -1496,6 +1497,8 @@ void __cpuinit per_cpu_trap_init(void)
|
2010-02-28 18:33:15 +02:00
|
|
|
if (cpu_has_mips_r2) {
|
|
|
|
|
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
|
|
|
|
|
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
|
|
|
|
|
+ if (get_c0_compare_irq)
|
|
|
|
|
+ cp0_compare_irq = get_c0_compare_irq();
|
|
|
|
|
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
|
|
|
|
|
if (cp0_perfcount_irq == cp0_compare_irq)
|
|
|
|
|
cp0_perfcount_irq = -1;
|
2010-03-03 11:40:17 +02:00
|
|
|
--- a/arch/mips/include/asm/time.h
|
|
|
|
|
+++ b/arch/mips/include/asm/time.h
|
|
|
|
|
@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
|
2010-02-28 18:33:15 +02:00
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_CEVT_R4K_LIB
|
|
|
|
|
extern unsigned int __weak get_c0_compare_int(void);
|
|
|
|
|
+extern unsigned int __weak get_c0_compare_irq(void);
|
|
|
|
|
extern int r4k_clockevent_init(void);
|
|
|
|
|
#endif
|
|
|
|
|
|
