target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch

   1 Index: linux-2.6.33/arch/mips/kernel/traps.c
   2 ===================================================================
   3 --- linux-2.6.33.orig/arch/mips/kernel/traps.c  2010-02-24 19:52:17.000000000 +0100
   4 +++ linux-2.6.33/arch/mips/kernel/traps.c       2010-02-28 16:51:35.397204241 +0100
   5 @@ -50,6 +50,7 @@
   6  #include <asm/types.h>
   7  #include <asm/stacktrace.h>
   8  #include <asm/irq.h>
   9 +#include <asm/time.h>
  10
  11  extern void check_wait(void);
  12  extern asmlinkage void r4k_wait(void);
  13 @@ -1496,6 +1497,8 @@
  14         if (cpu_has_mips_r2) {
  15                 cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
  16                 cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
  17 +               if (get_c0_compare_irq)
  18 +                       cp0_compare_irq = get_c0_compare_irq();
  19                 cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
  20                 if (cp0_perfcount_irq == cp0_compare_irq)
  21                         cp0_perfcount_irq = -1;
  22 Index: linux-2.6.33/arch/mips/include/asm/time.h
  23 ===================================================================
  24 --- linux-2.6.33.orig/arch/mips/include/asm/time.h      2010-02-24 19:52:17.000000000 +0100
  25 +++ linux-2.6.33/arch/mips/include/asm/time.h   2010-02-28 16:49:18.925959821 +0100
  26 @@ -52,6 +52,7 @@
  27   */
  28  #ifdef CONFIG_CEVT_R4K_LIB
  29  extern unsigned int __weak get_c0_compare_int(void);
  30 +extern unsigned int __weak get_c0_compare_irq(void);
  31  extern int r4k_clockevent_init(void);
  32  #endif
  33