summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-27 19:20:04 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-27 19:20:04 +0000
commita406ef4fe75dc93b1b52e9e8c7b02b5c7ba88577 (patch)
tree1205b8898e00e44b486380c6be8b14644c6c88e1 /target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch
parent3caf3c48cf0c3ef99654636a50e0e3c993d7b052 (diff)
ramips: switch to 2.6.37
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26328 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch')
-rw-r--r--target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch
new file mode 100644
index 000000000..38d997ef6
--- /dev/null
+++ b/target/linux/ramips/patches-2.6.37/001-mips-add-cp0-compare-irq-function.patch
@@ -0,0 +1,29 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -54,6 +54,7 @@
+ #include <asm/types.h>
+ #include <asm/stacktrace.h>
+ #include <asm/uasm.h>
++#include <asm/time.h>
+
+ extern void check_wait(void);
+ extern asmlinkage void r4k_wait(void);
+@@ -1578,6 +1579,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;
++ 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;
+--- 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
+