3 files changed, 12 insertions, 8 deletions

diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 6cc59e0b4582..8533f13a5ed1 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -101,7 +101,7 @@ static void iic_ioexc_eoi(unsigned int irq)
 static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc,
                             struct pt_regs *regs)
 {
-        struct cbe_iic_regs *node_iic = desc->handler_data;
+        struct cbe_iic_regs __iomem *node_iic = (void __iomem *)desc->handler_data;
         unsigned int base = (irq & 0xffffff00) | IIC_IRQ_TYPE_IOEXC;
         unsigned long bits, ack;
         int cascade;
@@ -320,7 +320,7 @@ static int __init setup_iic(void)
         struct device_node *dn;
         struct resource r0, r1;
         unsigned int node, cascade, found = 0;
-        struct cbe_iic_regs *node_iic;
+        struct cbe_iic_regs __iomem *node_iic;
         const u32 *np;
 
         for (dn = NULL;
@@ -357,7 +357,11 @@ static int __init setup_iic(void)
                 cascade = irq_create_mapping(iic_host, cascade);
                 if (cascade == NO_IRQ)
                         continue;
-                set_irq_data(cascade, node_iic);
+                /*
+                 * irq_data is a generic pointer that gets passed back
+                 * to us later, so the forced cast is fine.
+                 */
+                set_irq_data(cascade, (void __force *)node_iic);
                 set_irq_chained_handler(cascade , iic_ioexc_cascade);
                 out_be64(&node_iic->iic_ir,
                          (1 << 12)              /* priority */ |
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index d2b20eba5b87..aca4c3db0dde 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -345,8 +345,8 @@ static int cell_map_iommu_hardcoded(int num_nodes)
 
         /* node 0 */
         iommu = &cell_iommus[0];
-        iommu->mapped_base = ioremap(0x20000511000, 0x1000);
-        iommu->mapped_mmio_base = ioremap(0x20000510000, 0x1000);
+        iommu->mapped_base = ioremap(0x20000511000ul, 0x1000);
+        iommu->mapped_mmio_base = ioremap(0x20000510000ul, 0x1000);
 
         enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
 
@@ -358,8 +358,8 @@ static int cell_map_iommu_hardcoded(int num_nodes)
 
         /* node 1 */
         iommu = &cell_iommus[1];
-        iommu->mapped_base = ioremap(0x30000511000, 0x1000);
-        iommu->mapped_mmio_base = ioremap(0x30000510000, 0x1000);
+        iommu->mapped_base = ioremap(0x30000511000ul, 0x1000);
+        iommu->mapped_mmio_base = ioremap(0x30000510000ul, 0x1000);
 
         enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
 
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 6794de0cc0f0..b0e95d594c51 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -367,7 +367,7 @@ void __init spider_init_IRQ(void)
                 } else if (device_is_compatible(dn, "sti,platform-spider-pic")
                            && (chip < 2)) {
                         static long hard_coded_pics[] =
-                                { 0x24000008000, 0x34000008000 };
+                                { 0x24000008000ul, 0x34000008000ul};
                         r.start = hard_coded_pics[chip];
                 } else
                         continue;