aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch
diff options
context:
space:
mode:
authorOpenWrt Developers <openwrt-devel@openwrt.org>2008-12-16 14:07:55 +0000
committerOpenWrt Developers <openwrt-devel@openwrt.org>2008-12-16 14:07:55 +0000
commit269f4bbc24d3061764c9ee37f2da31d3228bec9a (patch)
tree07dc39510a01c7dca62cd1d2a794c1800ecab6c2 /target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch
parent9c2776b652d64041f98918b86f4554b7b678067c (diff)
downloadupstream-269f4bbc24d3061764c9ee37f2da31d3228bec9a.tar.gz
upstream-269f4bbc24d3061764c9ee37f2da31d3228bec9a.tar.bz2
upstream-269f4bbc24d3061764c9ee37f2da31d3228bec9a.zip
[ifxmips] cleanup sources and prepare for 2.6.27
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13660 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch')
-rw-r--r--target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch
new file mode 100644
index 0000000000..36f0552d4e
--- /dev/null
+++ b/target/linux/ifxmips/patches-2.6.27/000-mips-bad-intctl.patch
@@ -0,0 +1,34 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1484,7 +1484,16 @@ void __cpuinit per_cpu_trap_init(void)
+ */
+ if (cpu_has_mips_r2) {
+ cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
++ if (!cp0_compare_irq)
++ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
++
+ cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
++ if (!cp0_perfcount_irq)
++ cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ;
++
++ if (arch_fixup_c0_irqs)
++ arch_fixup_c0_irqs();
++
+ if (cp0_perfcount_irq == cp0_compare_irq)
+ cp0_perfcount_irq = -1;
+ } else {
+--- a/include/asm-mips/irq.h
++++ b/include/asm-mips/irq.h
+@@ -156,8 +156,12 @@ extern void free_irqno(unsigned int irq)
+ * IE7. Since R2 their number has to be read from the c0_intctl register.
+ */
+ #define CP0_LEGACY_COMPARE_IRQ 7
++#define CP0_LEGACY_PERFCNT_IRQ 7
+
+ extern int cp0_compare_irq;
+ extern int cp0_perfcount_irq;
+
++extern void __weak arch_fixup_c0_irqs(void);
++
++
+ #endif /* _ASM_IRQ_H */