diff options
author | John Crispin <blogic@openwrt.org> | 2009-10-02 08:09:27 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2009-10-02 08:09:27 +0000 |
commit | 1d74dc98755ec22bf1d5dada5ba66c06b0fcf842 (patch) | |
tree | 60fe3dbf83bf1fb7dc3f87a1b7495bbd90d5ff54 /target/linux/ifxmips/patches/000-mips-bad-intctl.patch | |
parent | a9f35cf146079654061cddf8ad854a40b3d95f69 (diff) | |
download | master-187ad058-1d74dc98755ec22bf1d5dada5ba66c06b0fcf842.tar.gz master-187ad058-1d74dc98755ec22bf1d5dada5ba66c06b0fcf842.tar.bz2 master-187ad058-1d74dc98755ec22bf1d5dada5ba66c06b0fcf842.zip |
bump ifxmips to .30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17817 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches/000-mips-bad-intctl.patch')
-rw-r--r-- | target/linux/ifxmips/patches/000-mips-bad-intctl.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/target/linux/ifxmips/patches/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches/000-mips-bad-intctl.patch deleted file mode 100644 index 3b1c2dc7c2..0000000000 --- a/target/linux/ifxmips/patches/000-mips-bad-intctl.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/arch/mips/kernel/traps.c -+++ b/arch/mips/kernel/traps.c -@@ -1464,7 +1464,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/include/asm-mips/irq.h -+++ b/include/asm-mips/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 */ |