aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-08 12:10:18 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-08 12:10:18 +0000
commitff0ca066b820c970c900187d960f89c0506ea9d5 (patch)
tree059ad1fcf4d3fb24797ef02b4f4d92d5f74817a1 /target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch
parent03965bd6f312c14c35512aae8c0c1393ca662dbe (diff)
downloadupstream-ff0ca066b820c970c900187d960f89c0506ea9d5.tar.gz
upstream-ff0ca066b820c970c900187d960f89c0506ea9d5.tar.bz2
upstream-ff0ca066b820c970c900187d960f89c0506ea9d5.zip
linux/ar71xx: add preliminary 2.6.36 kernel support (refresh patches)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23317 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch
new file mode 100644
index 0000000000..3c09a78c11
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch
@@ -0,0 +1,29 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -53,6 +53,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);
+@@ -1539,6 +1540,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
+