diff options
| author | John Crispin <john@openwrt.org> | 2011-05-29 21:19:26 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-05-29 21:19:26 +0000 |
| commit | 6608f419d1a23762f34482b4628f9159bcb81fc2 (patch) | |
| tree | 3f0b966c3d64ee995d89ee1a904c4306eedf846d /target/linux/lantiq/patches/000-mips-bad-intctl.patch | |
| parent | c7cdee0230c999197b017fb4aadd49f5eb7dc0b8 (diff) | |
| download | upstream-6608f419d1a23762f34482b4628f9159bcb81fc2.tar.gz upstream-6608f419d1a23762f34482b4628f9159bcb81fc2.tar.bz2 upstream-6608f419d1a23762f34482b4628f9159bcb81fc2.zip | |
* backport 2.6.8 patches to .39 / .32.33
* remove lqtapi
* bump tapi/dsl to .39
* migrate to new ltq_ style api
* add amazon_se support
SVN-Revision: 27026
Diffstat (limited to 'target/linux/lantiq/patches/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/lantiq/patches/000-mips-bad-intctl.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/lantiq/patches/000-mips-bad-intctl.patch b/target/linux/lantiq/patches/000-mips-bad-intctl.patch deleted file mode 100644 index 7c0f52db06..0000000000 --- a/target/linux/lantiq/patches/000-mips-bad-intctl.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/arch/mips/kernel/traps.c -+++ b/arch/mips/kernel/traps.c -@@ -1496,7 +1496,18 @@ 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 -@@ -133,9 +133,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 */ |