6 files changed, 9 insertions, 9 deletions

diff --git a/arch/powerpc/platforms/cell/celleb_scc_epci.c b/arch/powerpc/platforms/cell/celleb_scc_epci.c
index 05b0db3ef638..844c0facb4f7 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_epci.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_epci.c
@@ -393,19 +393,19 @@ static int __init celleb_setup_epci(struct device_node *node,
 
         if (of_address_to_resource(node, 0, &r))
                 goto error;
-        hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1));
+        hose->cfg_addr = ioremap(r.start, resource_size(&r));
         if (!hose->cfg_addr)
                 goto error;
         pr_debug("EPCI: cfg_addr map 0x%016llx->0x%016lx + 0x%016llx\n",
-                 r.start, (unsigned long)hose->cfg_addr, (r.end - r.start + 1));
+                 r.start, (unsigned long)hose->cfg_addr, resource_size(&r));
 
         if (of_address_to_resource(node, 2, &r))
                 goto error;
-        hose->cfg_data = ioremap(r.start, (r.end - r.start + 1));
+        hose->cfg_data = ioremap(r.start, resource_size(&r));
         if (!hose->cfg_data)
                 goto error;
         pr_debug("EPCI: cfg_data map 0x%016llx->0x%016lx + 0x%016llx\n",
-                 r.start, (unsigned long)hose->cfg_data, (r.end - r.start + 1));
+                 r.start, (unsigned long)hose->cfg_data, resource_size(&r));
 
         hose->ops = &celleb_epci_ops;
         celleb_epci_init(hose);
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index a881bbee8de0..ae790ac4a589 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -494,7 +494,7 @@ static __init int celleb_setup_pciex(struct device_node *node,
                 pr_err("PCIEXC:Failed to get config resource.\n");
                 return 1;
         }
-        phb->cfg_addr = ioremap(r.start, r.end - r.start + 1);
+        phb->cfg_addr = ioremap(r.start, resource_size(&r));
         if (!phb->cfg_addr) {
                 pr_err("PCIEXC:Failed to remap SMMIO region.\n");
                 return 1;
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
index d809836bcf5f..7f92096fe968 100644
--- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c
+++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
@@ -24,7 +24,7 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/machdep.h>
 #include <asm/spu.h>
 
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index dbb641ea90dd..f2e1dfe4bf31 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -28,7 +28,7 @@
 #include <linux/cpu.h>
 
 #include <asm/ptrace.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/irq.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index f465d474ad9b..4e5c91489c02 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -222,7 +222,7 @@ static int spu_map_resource(struct spu *spu, int nr,
                 return ret;
         if (phys)
                 *phys = resource.start;
-        len = resource.end - resource.start + 1;
+        len = resource_size(&resource);
         *virt = ioremap(resource.start, len);
         if (!*virt)
                 return -EINVAL;
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 0c87bcd2452a..bf4d41d8fa14 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -24,7 +24,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/spu.h>
 #include <asm/spu_csa.h>
 #include "spufs.h"