diff options
| author | thl <thl@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-04 14:46:02 +0000 |
|---|---|---|
| committer | thl <thl@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-04 14:46:02 +0000 |
| commit | 1d3e394ebecc98074687a56454489b7cd59e3c03 (patch) | |
| tree | 617615dec93d41efd40b52c5d72a10b43d1fe247 /target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch | |
| parent | 7d570ded94cb1c8c23bb3f190ffd0d530dfb26e5 (diff) | |
[ifxmips] move kernel support to 2.6.28.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14747 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch new file mode 100644 index 0000000000..22f7e0c752 --- /dev/null +++ b/target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch @@ -0,0 +1,34 @@ +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -1514,7 +1514,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 +@@ -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 */ |