Apply patch 240-irq_fix.patch directly

SVN-Revision: 19457

diff --git a/target/linux/amazon/files/arch/mips/amazon/interrupt.c b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
index 17980fb11819c17f3e0fa05cc2c3e38f7f81ad6f..4746f1247e03851ad58e0d3783c413dea66c395d 100644 (file)
--- a/target/linux/amazon/files/arch/mips/amazon/interrupt.c
+++ b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
@@ -177,12 +177,11 @@ void __init arch_init_irq(void)
                setup_irq(i, &cascade);
        }
 
-       for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++) {
-               irq_desc[i].status      = IRQ_DISABLED;
-               irq_desc[i].action      = 0;
-               irq_desc[i].depth       = 1;
-               set_irq_chip(i, &amazon_irq_type);
-       }
+       for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++)
+               set_irq_chip_and_handler(i, &amazon_irq_type,
+                       handle_level_irq);
+
+       set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
 }
 
 void __cpuinit arch_fixup_c0_irqs(void)

diff --git a/target/linux/amazon/patches-2.6.30/240-irq_fix.patch b/target/linux/amazon/patches-2.6.30/240-irq_fix.patch
deleted file mode 100644 (file)
index 151f1b4..0000000
--- a/target/linux/amazon/patches-2.6.30/240-irq_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/amazon/interrupt.c
-+++ b/arch/mips/amazon/interrupt.c
-@@ -177,12 +177,11 @@ void __init arch_init_irq(void)
-               setup_irq(i, &cascade);
-       }
- 
--      for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++) {
--              irq_desc[i].status      = IRQ_DISABLED;
--              irq_desc[i].action      = 0;
--              irq_desc[i].depth       = 1;
--              set_irq_chip(i, &amazon_irq_type);
--      }
-+      for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++)
-+              set_irq_chip_and_handler(i, &amazon_irq_type,
-+                      handle_level_irq);
-+
-+      set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
- }
- 
- void __cpuinit arch_fixup_c0_irqs(void)