| 12345678910111213141516171819202122232425262728293031323334353637383940414243 |
- --- a/arch/mips/kernel/traps.c
- +++ b/arch/mips/kernel/traps.c
- @@ -43,6 +43,7 @@
- #include <asm/mmu_context.h>
- #include <asm/types.h>
- #include <asm/stacktrace.h>
- +#include <asm/time.h>
-
- extern asmlinkage void handle_int(void);
- extern asmlinkage void handle_tlbm(void);
- @@ -1464,6 +1465,8 @@ void __cpuinit per_cpu_trap_init(void)
- */
- 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
- @@ -53,6 +53,7 @@ extern int (*perf_irq)(void);
- #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)
- {
- --- a/arch/mips/atheros/board.c
- +++ b/arch/mips/atheros/board.c
- @@ -265,6 +265,11 @@ void (*board_time_init)(void);
- void __init plat_time_init(void) {
- board_time_init();
- }
- +
- +unsigned int __cpuinit get_c0_compare_irq(void)
- +{
- + return CP0_LEGACY_COMPARE_IRQ;
- +}
- #endif
-
- void __init arch_init_irq(void)
|
