aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-2.6.39/001-mips-add-cp0-compare-irq-function.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-07-03 15:02:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-07-03 15:02:06 +0000
commit0fde070cf96233b124204a0e061897270b060e4c (patch)
tree8c1f10a682895d2d881e4e3e91312dbaace6cc6d /target/linux/ramips/patches-2.6.39/001-mips-add-cp0-compare-irq-function.patch
parent1c96bc9abc83c9260788631829060fcb1dabc877 (diff)
downloadupstream-0fde070cf96233b124204a0e061897270b060e4c.tar.gz
upstream-0fde070cf96233b124204a0e061897270b060e4c.tar.bz2
upstream-0fde070cf96233b124204a0e061897270b060e4c.zip
ramips: add 2.6.39 support
Based on the patches from #9625 SVN-Revision: 27396
Diffstat (limited to 'target/linux/ramips/patches-2.6.39/001-mips-add-cp0-compare-irq-function.patch')
-rw-r--r--target/linux/ramips/patches-2.6.39/001-mips-add-cp0-compare-irq-function.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-2.6.39/001-mips-add-cp0-compare-irq-function.patch b/target/linux/ramips/patches-2.6.39/001-mips-add-cp0-compare-irq-function.patch
new file mode 100644
index 0000000000..71b0b3f3e2
--- /dev/null
+++ b/target/linux/ramips/patches-2.6.39/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);
+@@ -1576,6 +1577,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
+