2008-10-05 09:29:44 +03:00
|
|
|
--- a/arch/mips/kernel/traps.c
|
|
|
|
|
+++ b/arch/mips/kernel/traps.c
|
|
|
|
|
@@ -45,6 +45,7 @@
|
|
|
|
|
#include <asm/mmu_context.h>
|
|
|
|
|
#include <asm/types.h>
|
|
|
|
|
#include <asm/stacktrace.h>
|
|
|
|
|
+#include <asm/time.h>
|
|
|
|
|
|
|
|
|
|
extern void check_wait(void);
|
|
|
|
|
extern asmlinkage void r4k_wait(void);
|
2008-10-15 22:30:21 +03:00
|
|
|
@@ -1484,6 +1485,8 @@ void __cpuinit per_cpu_trap_init(void)
|
2008-10-05 09:29:44 +03:00
|
|
|
*/
|
|
|
|
|
if (cpu_has_mips_r2) {
|
|
|
|
|
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
|
|
|
|
|
+ if (get_c0_compare_irq)
|
|
|
|
|
+ cp0_compare_irq = get_c0_compare_irq();
|
|
|
|
|
cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
|
|
|
|
|
if (cp0_perfcount_irq == cp0_compare_irq)
|
|
|
|
|
cp0_perfcount_irq = -1;
|
|
|
|
|
--- a/include/asm-mips/time.h
|
|
|
|
|
+++ b/include/asm-mips/time.h
|
2008-10-15 22:30:21 +03:00
|
|
|
@@ -53,6 +53,7 @@ extern int (*perf_irq)(void);
|
2008-10-05 09:29:44 +03:00
|
|
|
#ifdef CONFIG_CEVT_R4K
|
|
|
|
|
extern int mips_clockevent_init(void);
|
|
|
|
|
extern unsigned int __weak get_c0_compare_int(void);
|
|
|
|
|
+extern unsigned int __weak get_c0_compare_irq(void);
|
|
|
|
|
#else
|
|
|
|
|
static inline int mips_clockevent_init(void)
|
|
|
|
|
{
|
