diff options
| author | John Crispin <john@openwrt.org> | 2010-11-03 19:02:27 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2010-11-03 19:02:27 +0000 |
| commit | 251535331cb7393bc911dfd5a7c01f670b292549 (patch) | |
| tree | 52d4fa9c44a169c9ed8878b7bda7c5f23789447e /target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch | |
| parent | 100fc4c7cec5500314c20c5d9a2ff0aa8a07a04a (diff) | |
| download | upstream-251535331cb7393bc911dfd5a7c01f670b292549.tar.gz upstream-251535331cb7393bc911dfd5a7c01f670b292549.tar.bz2 upstream-251535331cb7393bc911dfd5a7c01f670b292549.zip | |
* bump kernel to 2.6.35.8 * merge arcadyn mach files * fixes ar9 * adds hack for tapi drivers
SVN-Revision: 23836
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch deleted file mode 100644 index ad3fe9fb32..0000000000 --- a/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 */ |