diff options
author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-26 15:53:05 +0000 |
---|---|---|
committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-05-26 15:53:05 +0000 |
commit | d756ab6289aef5f8a3c125381ab379935e922ed6 (patch) | |
tree | 7fc67d2adb35c242cf55a4faab936a0578c23ca0 /target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch | |
parent | 83a8d4e9e14a148ad3552c755c4a2433be52f8a5 (diff) |
[ramips] update to 2.6.34, signed of by russiane39, thx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21573 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch')
-rw-r--r-- | target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch | 33 |
1 files changed, 33 insertions, 0 deletions
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 new file mode 100644 index 000000000..1eff47b56 --- /dev/null +++ b/target/linux/ramips/patches-2.6.34/001-mips-add-cp0-compare-irq-function.patch @@ -0,0 +1,33 @@ +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 +@@ -51,6 +51,7 @@ + #include <asm/stacktrace.h> + #include <asm/irq.h> + #include <asm/uasm.h> ++#include <asm/time.h> + + extern void check_wait(void); + extern asmlinkage void r4k_wait(void); +@@ -1506,6 +1507,8 @@ + if (cpu_has_mips_r2) { + cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; + cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7; ++ if (get_c0_compare_irq) ++ cp0_compare_irq = get_c0_compare_irq(); + 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 @@ + */ + #ifdef CONFIG_CEVT_R4K_LIB + extern unsigned int __weak get_c0_compare_int(void); ++extern unsigned int __weak get_c0_compare_irq(void); + extern int r4k_clockevent_init(void); + #endif + |