diff options
| author | John Crispin <blogic@openwrt.org> | 2014-12-05 00:19:40 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-12-05 00:19:40 +0000 |
| commit | f5ea60f000d1a53780c57b0a641201f317c63ced (patch) | |
| tree | cfed792b13b23a8a2371990dcec6f534fea290ec /target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch | |
| parent | 491ce2c749fb73801794f9162227b37075bb250e (diff) | |
| download | upstream-f5ea60f000d1a53780c57b0a641201f317c63ced.tar.gz upstream-f5ea60f000d1a53780c57b0a641201f317c63ced.tar.bz2 upstream-f5ea60f000d1a53780c57b0a641201f317c63ced.zip | |
amazon: R.I.P.
its been broken for 2 1/2 years
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43516 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch b/target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch deleted file mode 100644 index 0aa37780a8..0000000000 --- a/target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/arch/mips/kernel/traps.c -+++ b/arch/mips/kernel/traps.c -@@ -1593,7 +1593,16 @@ 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 (!cp0_compare_irq) -+ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; -+ - cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 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 -@@ -139,9 +139,11 @@ 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_compare_irq_shift; - extern int cp0_perfcount_irq; -+extern void __weak arch_fixup_c0_irqs(void); - - #endif /* _ASM_IRQ_H */ |