atheros: 2.6.26 patches
[openwrt/svn-archive/archive.git] / target / linux / atheros / patches-2.6.26 / 901-get_c0_compare_irq_function.patch
1 --- a/arch/mips/kernel/traps.c
2 +++ b/arch/mips/kernel/traps.c
3 @@ -43,6 +43,7 @@
4 #include <asm/mmu_context.h>
5 #include <asm/types.h>
6 #include <asm/stacktrace.h>
7 +#include <asm/time.h>
8
9 extern asmlinkage void handle_int(void);
10 extern asmlinkage void handle_tlbm(void);
11 @@ -1464,6 +1465,8 @@
12 */
13 if (cpu_has_mips_r2) {
14 cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
15 + if (get_c0_compare_irq)
16 + cp0_compare_irq = get_c0_compare_irq();
17 cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
18 if (cp0_perfcount_irq == cp0_compare_irq)
19 cp0_perfcount_irq = -1;
20 --- a/include/asm-mips/time.h
21 +++ b/include/asm-mips/time.h
22 @@ -53,6 +53,7 @@
23 #ifdef CONFIG_CEVT_R4K
24 extern int mips_clockevent_init(void);
25 extern unsigned int __weak get_c0_compare_int(void);
26 +extern unsigned int __weak get_c0_compare_irq(void);
27 #else
28 static inline int mips_clockevent_init(void)
29 {
30 --- a/arch/mips/atheros/board.c
31 +++ b/arch/mips/atheros/board.c
32 @@ -205,6 +205,11 @@
33 void __init plat_time_init(void) {
34 board_time_init();
35 }
36 +
37 +unsigned int __init get_c0_compare_irq(void)
38 +{
39 + return CP0_LEGACY_COMPARE_IRQ;
40 +}
41 #endif
42
43 void __init arch_init_irq(void)