surprise :p
[openwrt-10.03/.git] / target / linux / ar71xx / patches / 901-get_c0_compare_irq_function.patch
1 --- a/arch/mips/kernel/traps.c
2 +++ b/arch/mips/kernel/traps.c
3 @@ -42,6 +42,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 @@ -1379,6 +1380,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  {