diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-22 07:20:53 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-22 07:20:53 +0000 |
commit | 631bf8224163ee536eb9e3aa347d810bd59c76fe (patch) | |
tree | 3e2eddde5f2a885c877cc1ff405d94286d6c7535 /target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch | |
parent | f37deb2b1b95489ac2738bca2b00c546bf76db12 (diff) | |
download | upstream-631bf8224163ee536eb9e3aa347d810bd59c76fe.tar.gz upstream-631bf8224163ee536eb9e3aa347d810bd59c76fe.tar.bz2 upstream-631bf8224163ee536eb9e3aa347d810bd59c76fe.zip |
amazon: remove 2.6.3{0,2} support
SVN-Revision: 31433
Diffstat (limited to 'target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch')
-rw-r--r-- | target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch b/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch deleted file mode 100644 index 5de5064dc4..0000000000 --- a/target/linux/amazon/patches-2.6.30/000-mips-bad-intctl.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/kernel/traps.c -+++ b/arch/mips/kernel/traps.c -@@ -1542,7 +1542,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 -@@ -157,8 +157,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 */ |