5 files changed, 7 insertions, 11 deletions

diff --git a/arch/powerpc/platforms/cell/beat.c b/arch/powerpc/platforms/cell/beat.c
index 232fc384e855..852592b2b712 100644
--- a/arch/powerpc/platforms/cell/beat.c
+++ b/arch/powerpc/platforms/cell/beat.c
@@ -230,7 +230,7 @@ static int __init beat_register_event(void)
                 }
                 ev->virq = virq;
 
-                rc = request_irq(virq, ev->handler, IRQF_DISABLED,
+                rc = request_irq(virq, ev->handler, 0,
                                       ev->typecode, NULL);
                 if (rc != 0) {
                         printk(KERN_ERR "Beat: failed to request virtual IRQ"
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index ae790ac4a589..14be2bd358b8 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -514,7 +514,7 @@ static __init int celleb_setup_pciex(struct device_node *node,
         virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
                                      oirq.size);
         if (request_irq(virq, pciex_handle_internal_irq,
-                        IRQF_DISABLED, "pciex", (void *)phb)) {
+                        0, "pciex", (void *)phb)) {
                 pr_err("PCIEXC:Failed to request irq\n");
                 goto error;
         }
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index fc46fcac3921..592c3d51b817 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -412,8 +412,7 @@ static void cell_iommu_enable_hardware(struct cbe_iommu *iommu)
                         IIC_IRQ_IOEX_ATI | (iommu->nid << IIC_IRQ_NODE_SHIFT));
         BUG_ON(virq == NO_IRQ);
 
-        ret = request_irq(virq, ioc_interrupt, IRQF_DISABLED,
-                        iommu->name, iommu);
+        ret = request_irq(virq, ioc_interrupt, 0, iommu->name, iommu);
         BUG_ON(ret);
 
         /* set the IOC segment table origin register (and turn on the iommu) */
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 1acf36010423..59c1a1694104 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -392,7 +392,7 @@ static int __init cbe_init_pm_irq(void)
                 }
 
                 rc = request_irq(irq, cbe_pm_irq,
-                                 IRQF_DISABLED, "cbe-pmu-0", NULL);
+                                 0, "cbe-pmu-0", NULL);
                 if (rc) {
                         printk("ERROR: Request for irq on node %d failed\n",
                                node);
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 3675da73623f..e94d3ecdd8bb 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -442,8 +442,7 @@ static int spu_request_irqs(struct spu *spu)
                 snprintf(spu->irq_c0, sizeof (spu->irq_c0), "spe%02d.0",
                          spu->number);
                 ret = request_irq(spu->irqs[0], spu_irq_class_0,
-                                  IRQF_DISABLED,
-                                  spu->irq_c0, spu);
+                                  0, spu->irq_c0, spu);
                 if (ret)
                         goto bail0;
         }
@@ -451,8 +450,7 @@ static int spu_request_irqs(struct spu *spu)
                 snprintf(spu->irq_c1, sizeof (spu->irq_c1), "spe%02d.1",
                          spu->number);
                 ret = request_irq(spu->irqs[1], spu_irq_class_1,
-                                  IRQF_DISABLED,
-                                  spu->irq_c1, spu);
+                                  0, spu->irq_c1, spu);
                 if (ret)
                         goto bail1;
         }
@@ -460,8 +458,7 @@ static int spu_request_irqs(struct spu *spu)
                 snprintf(spu->irq_c2, sizeof (spu->irq_c2), "spe%02d.2",
                          spu->number);
                 ret = request_irq(spu->irqs[2], spu_irq_class_2,
-                                  IRQF_DISABLED,
-                                  spu->irq_c2, spu);
+                                  0, spu->irq_c2, spu);
                 if (ret)
                         goto bail2;
         }