X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fifxmips%2Fpatches-2.6.28%2F000-mips-bad-intctl.patch;fp=target%2Flinux%2Fifxmips%2Fpatches-2.6.28%2F000-mips-bad-intctl.patch;h=0000000000000000000000000000000000000000;hb=4fea8d2283645d50dc58ab28036713f2e16e5082;hp=22f7e0c752d983fe4930d9d2cb278b1c293d57cd;hpb=9e0befc4f375fcf7886eac609ac82738c0e5129c;p=openwrt-10.03%2F.git

diff --git a/target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch
deleted file mode 100644
index 22f7e0c75..000000000
--- a/target/linux/ifxmips/patches-2.6.28/000-mips-bad-intctl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -1514,7 +1514,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
-@@ -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 */