aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-01-31 15:13:14 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-01-31 15:13:14 +0000
commit6a78996e768731f8018c2081dbbcec2d48027a89 (patch)
tree50e23602247ee97b74043a661293341ed465f96e /target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch
parent4d1bfc37607ebbd9842c2555bd4ded9c0c231649 (diff)
downloadupstream-6a78996e768731f8018c2081dbbcec2d48027a89.tar.gz
upstream-6a78996e768731f8018c2081dbbcec2d48027a89.tar.bz2
upstream-6a78996e768731f8018c2081dbbcec2d48027a89.zip
Add kernel 2.6.32 support
SVN-Revision: 19458
Diffstat (limited to 'target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch')
-rw-r--r--target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch b/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch
new file mode 100644
index 0000000000..ad3fe9fb32
--- /dev/null
+++ b/target/linux/amazon/patches-2.6.32/000-mips-bad-intctl.patch
@@ -0,0 +1,32 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1537,7 +1537,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/arch/mips/include/asm/irq.h
++++ b/arch/mips/include/asm/irq.h
+@@ -158,8 +158,10 @@ 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 */