package/compcache: use mainline modules for kernels >=2.6.33 (thank you nbd)

[openwrt.git] / target / linux / ramips / patches-2.6.34 / 001-mips-add-cp0-compare-irq-function.patch

diff --git a/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
index 1eff47b..6618a5d 100644 (file)
--- a/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
+++ b/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.34/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.34.orig/arch/mips/kernel/traps.c 2010-05-17 01:17:36.000000000 +0400
-+++ linux-2.6.34/arch/mips/kernel/traps.c      2010-05-22 14:22:35.000000000 +0400
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
 @@ -51,6 +51,7 @@
  #include <asm/stacktrace.h>
  #include <asm/irq.h>
@@ -10,7 +8,7 @@ Index: linux-2.6.34/arch/mips/kernel/traps.c
  
  extern void check_wait(void);
  extern asmlinkage void r4k_wait(void);
-@@ -1506,6 +1507,8 @@
+@@ -1506,6 +1507,8 @@ void __cpuinit per_cpu_trap_init(void)
        if (cpu_has_mips_r2) {
                cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
                cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
@@ -19,11 +17,9 @@ Index: linux-2.6.34/arch/mips/kernel/traps.c
                cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
                if (cp0_perfcount_irq == cp0_compare_irq)
                        cp0_perfcount_irq = -1;
-Index: linux-2.6.34/arch/mips/include/asm/time.h
-===================================================================
---- linux-2.6.34.orig/arch/mips/include/asm/time.h     2010-05-17 01:17:36.000000000 +0400
-+++ linux-2.6.34/arch/mips/include/asm/time.h  2010-05-21 11:32:22.000000000 +0400
-@@ -52,6 +52,7 @@
+--- a/arch/mips/include/asm/time.h
++++ b/arch/mips/include/asm/time.h
+@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
   */
  #ifdef CONFIG_CEVT_R4K_LIB
  extern unsigned int __weak get_c0_compare_int(void);