[PATCH] irq-flags: POWERPC: Use the new IRQF_ constants

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9 files changed, 25 insertions, 21 deletions

diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 880c8083d16f..22da1335445a 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -304,11 +304,11 @@ static void iic_request_ipi(int ipi, const char *name)
         int irq;
 
         irq = iic_ipi_to_irq(ipi);
-        /* IPIs are marked SA_INTERRUPT as they must run with irqs
+        /* IPIs are marked IRQF_DISABLED as they must run with irqs
          * disabled */
         get_irq_desc(irq)->chip = &iic_pic;
         get_irq_desc(irq)->status |= IRQ_PER_CPU;
-        request_irq(irq, iic_ipi_action, SA_INTERRUPT, name, NULL);
+        request_irq(irq, iic_ipi_action, IRQF_DISABLED, name, NULL);
 }
 
 void iic_request_IPIs(void)
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index b306723abb87..656c1ef5f4ad 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -274,19 +274,19 @@ spu_request_irqs(struct spu *spu)
 
         snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0", spu->number);
         ret = request_irq(irq_base + spu->isrc,
-                 spu_irq_class_0, SA_INTERRUPT, spu->irq_c0, spu);
+                 spu_irq_class_0, IRQF_DISABLED, spu->irq_c0, spu);
         if (ret)
                 goto out;
 
         snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1", spu->number);
         ret = request_irq(irq_base + IIC_CLASS_STRIDE + spu->isrc,
-                 spu_irq_class_1, SA_INTERRUPT, spu->irq_c1, spu);
+                 spu_irq_class_1, IRQF_DISABLED, spu->irq_c1, spu);
         if (ret)
                 goto out1;
 
         snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2", spu->number);
         ret = request_irq(irq_base + 2*IIC_CLASS_STRIDE + spu->isrc,
-                 spu_irq_class_2, SA_INTERRUPT, spu->irq_c2, spu);
+                 spu_irq_class_2, IRQF_DISABLED, spu->irq_c2, spu);
         if (ret)
                 goto out2;
         goto out;
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 532bce57c0dc..c9b09a9e6050 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -381,7 +381,7 @@ static struct irqaction xmon_action = {
 
 static struct irqaction gatwick_cascade_action = {
         .handler        = gatwick_action,
-        .flags          = SA_INTERRUPT,
+        .flags          = IRQF_DISABLED,
         .mask           = CPU_MASK_NONE,
         .name           = "cascade",
 };
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 63affcb24219..827b7121ffb8 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -377,7 +377,7 @@ static void __init psurge_dual_sync_tb(int cpu_nr)
 
 static struct irqaction psurge_irqaction = {
         .handler = psurge_primary_intr,
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .mask = CPU_MASK_NONE,
         .name = "primary IPI",
 };
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 4d935d0817f2..2ffebe31cb2d 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -59,7 +59,7 @@ static struct radix_tree_root irq_map = RADIX_TREE_INIT(GFP_ATOMIC);
 
 /*
  * Mark IPIs as higher priority so we can take them inside interrupts that
- * arent marked SA_INTERRUPT
+ * arent marked IRQF_DISABLED
  */
 #define IPI_PRIORITY            4
 
@@ -586,9 +586,12 @@ void xics_request_IPIs(void)
 {
         virt_irq_to_real_map[XICS_IPI] = XICS_IPI;
 
-        /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
-        request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, SA_INTERRUPT,
-                    "IPI", NULL);
+        /*
+         * IPIs are marked IRQF_DISABLED as they must run with irqs
+         * disabled
+         */
+        request_irq(irq_offset_up(XICS_IPI), xics_ipi_action,
+                    IRQF_DISABLED, "IPI", NULL);
         get_irq_desc(irq_offset_up(XICS_IPI))->status |= IRQ_PER_CPU;
 }
 #endif
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 2bff30f6d635..1a3ef1ab9d6e 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -167,7 +167,7 @@ static struct resource pic_edgectrl_iores = {
 
 static struct irqaction i8259_irqaction = {
         .handler = no_action,
-        .flags = SA_INTERRUPT,
+        .flags = IRQF_DISABLED,
         .mask = CPU_MASK_NONE,
         .name = "82c59 secondary cascade",
 };
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 63ff89575cbb..7e469358895f 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -540,7 +540,7 @@ static void mpic_end_ipi(unsigned int irq)
          * IPIs are marked IRQ_PER_CPU. This has the side effect of
          * preventing the IRQ_PENDING/IRQ_INPROGRESS logic from
          * applying to them. We EOI them late to avoid re-entering.
-         * We mark IPI's with SA_INTERRUPT as they must run with
+         * We mark IPI's with IRQF_DISABLED as they must run with
          * irqs disabled.
          */
         mpic_eoi(mpic);
@@ -1027,14 +1027,17 @@ void mpic_request_ipis(void)
         
         printk("requesting IPIs ... \n");
 
-        /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
-        request_irq(mpic->ipi_offset+0, mpic_ipi_action, SA_INTERRUPT,
+        /*
+         * IPIs are marked IRQF_DISABLED as they must run with irqs
+         * disabled
+         */
+        request_irq(mpic->ipi_offset+0, mpic_ipi_action, IRQF_DISABLED,
                     "IPI0 (call function)", mpic);
-        request_irq(mpic->ipi_offset+1, mpic_ipi_action, SA_INTERRUPT,
+        request_irq(mpic->ipi_offset+1, mpic_ipi_action, IRQF_DISABLED,
                    "IPI1 (reschedule)", mpic);
-        request_irq(mpic->ipi_offset+2, mpic_ipi_action, SA_INTERRUPT,
+        request_irq(mpic->ipi_offset+2, mpic_ipi_action, IRQF_DISABLED,
                    "IPI2 (unused)", mpic);
-        request_irq(mpic->ipi_offset+3, mpic_ipi_action, SA_INTERRUPT,
+        request_irq(mpic->ipi_offset+3, mpic_ipi_action, IRQF_DISABLED,
                    "IPI3 (debugger break)", mpic);
 
         printk("IPIs requested... \n");
diff --git a/include/asm-powerpc/floppy.h b/include/asm-powerpc/floppy.h
index 9c8d91bf5a0d..fd242a22331c 100644
--- a/include/asm-powerpc/floppy.h
+++ b/include/asm-powerpc/floppy.h
@@ -27,7 +27,7 @@
 #define fd_disable_irq()        disable_irq(FLOPPY_IRQ)