[amazon] Apply patch 220-fix_timer.patch directly

[openwrt-10.03/.git] / target / linux / amazon / files / arch / mips / amazon / interrupt.c

diff --git a/target/linux/amazon/files/arch/mips/amazon/interrupt.c b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
index 5e34e0577b846f3e94ed16ceda19bbd73e15c8dd..17980fb11819c17f3e0fa05cc2c3e38f7f81ad6f 100644 (file)
--- a/target/linux/amazon/files/arch/mips/amazon/interrupt.c
+++ b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
@@ -157,7 +157,7 @@ out:
 
 static struct irqaction cascade = {
        .handler        = no_action,
-       .flags          = SA_INTERRUPT,
+       .flags          = IRQF_DISABLED,
        .name           = "cascade",
 };
 
@@ -184,3 +184,10 @@ void __init arch_init_irq(void)
                set_irq_chip(i, &amazon_irq_type);
        }
 }
+
+void __cpuinit arch_fixup_c0_irqs(void)
+{
+       /* FIXME: check for CPUID and only do fix for specific chips/versions */
+       cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
+       cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ;
+}