summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-24 19:29:50 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-24 19:29:50 +0000
commit118b74e6cd80af62df53057001fb6d1476cb4ca6 (patch)
treef8c70e746cad812e42f615d55e4996343e373b1a /target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch
parent39f1ae6a331e61efecfdd82374a3e37445413bc3 (diff)
[ar71xx] add patches for 2.6.31
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17366 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch
new file mode 100644
index 000000000..cf9c405ca
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch
@@ -0,0 +1,29 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -48,6 +48,7 @@
+ #include <asm/types.h>
+ #include <asm/stacktrace.h>
+ #include <asm/irq.h>
++#include <asm/time.h>
+
+ extern void check_wait(void);
+ extern asmlinkage void r4k_wait(void);
+@@ -1538,6 +1539,8 @@ void __cpuinit per_cpu_trap_init(void)
+ */
+ if (cpu_has_mips_r2) {
+ cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
++ if (get_c0_compare_irq)
++ cp0_compare_irq = get_c0_compare_irq();
+ cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
+ if (cp0_perfcount_irq == cp0_compare_irq)
+ cp0_perfcount_irq = -1;
+--- 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);
++extern unsigned int __weak get_c0_compare_irq(void);
+ extern int r4k_clockevent_init(void);
+ #endif
+