11 files changed, 20 insertions, 20 deletions

diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index 192a93509372..72254848a228 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -99,7 +99,7 @@ static void beatic_end_irq(unsigned int irq_plug)
         err = beat_downcount_of_interrupt(irq_plug);
         if (err != 0) {
                 if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
-                        panic("Failed to downcount IRQ! Error = %16lx", err);
+                        panic("Failed to downcount IRQ! Error = %16llx", err);
 
                 printk(KERN_ERR "IRQ over-downcounted, plug %d\n", irq_plug);
         }
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index ec7c8f45a215..e6506cd0ff94 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -118,7 +118,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
         policy->cur = cbe_freqs[cur_pmode].frequency;
 
 #ifdef CONFIG_SMP
-        policy->cpus = per_cpu(cpu_sibling_map, policy->cpu);
+        cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu));
 #endif
 
         cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);
diff --git a/arch/powerpc/platforms/cell/celleb_scc_epci.c b/arch/powerpc/platforms/cell/celleb_scc_epci.c
index 08c285b10e30..48ec88a38a12 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_epci.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_epci.c
@@ -405,7 +405,7 @@ static int __init celleb_setup_epci(struct device_node *node,
         hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1));
         if (!hose->cfg_addr)
                 goto error;
-        pr_debug("EPCI: cfg_addr map 0x%016lx->0x%016lx + 0x%016lx\n",
+        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));
 
         if (of_address_to_resource(node, 2, &r))
@@ -413,7 +413,7 @@ static int __init celleb_setup_epci(struct device_node *node,
         hose->cfg_data = ioremap(r.start, (r.end - r.start + 1));
         if (!hose->cfg_data)
                 goto error;
-        pr_debug("EPCI: cfg_data map 0x%016lx->0x%016lx + 0x%016lx\n",
+        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));
 
         hose->ops = &celleb_epci_ops;
diff --git a/arch/powerpc/platforms/cell/cpufreq_spudemand.c b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
index a3c6c01bd6db..968c1c0b4d5b 100644
--- a/arch/powerpc/platforms/cell/cpufreq_spudemand.c
+++ b/arch/powerpc/platforms/cell/cpufreq_spudemand.c
@@ -110,7 +110,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
                 }
 
                 /* initialize spu_gov_info for all affected cpus */
-                for_each_cpu_mask(i, policy->cpus) {
+                for_each_cpu(i, policy->cpus) {
                         affected_info = &per_cpu(spu_gov_info, i);
                         affected_info->policy = policy;
                 }
@@ -127,7 +127,7 @@ static int spu_gov_govern(struct cpufreq_policy *policy, unsigned int event)
                 spu_gov_cancel_work(info);
 
                 /* clean spu_gov_info for all affected cpus */
-                for_each_cpu_mask (i, policy->cpus) {
+                for_each_cpu (i, policy->cpus) {
                         info = &per_cpu(spu_gov_info, i);
                         info->policy = NULL;
                 }
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 88d94b59a7cb..ee5033eddf01 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -855,7 +855,7 @@ static int __init cell_iommu_init_disabled(void)
          */
         if (np && size < lmb_end_of_DRAM()) {
                 printk(KERN_WARNING "iommu: force-enabled, dma window"
-                       " (%ldMB) smaller than total memory (%ldMB)\n",
+                       " (%ldMB) smaller than total memory (%lldMB)\n",
                        size >> 20, lmb_end_of_DRAM() >> 20);
                 return -ENODEV;
         }
@@ -985,7 +985,7 @@ static void cell_dma_dev_setup_fixed(struct device *dev)
         addr = cell_iommu_get_fixed_address(dev) + dma_iommu_fixed_base;
         archdata->dma_data = (void *)addr;
 
-        dev_dbg(dev, "iommu: fixed addr = %lx\n", addr);
+        dev_dbg(dev, "iommu: fixed addr = %llx\n", addr);
 }
 
 static void insert_16M_pte(unsigned long addr, unsigned long *ptab,
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 7b4cefa2199b..5f961c464cc4 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -38,16 +38,16 @@ static void dump_fir(int cpu)
         /* Todo: do some nicer parsing of bits and based on them go down
          * to other sub-units FIRs and not only IIC
          */
-        printk(KERN_ERR "Global Checkstop FIR    : 0x%016lx\n",
+        printk(KERN_ERR "Global Checkstop FIR    : 0x%016llx\n",
                in_be64(&pregs->checkstop_fir));
-        printk(KERN_ERR "Global Recoverable FIR  : 0x%016lx\n",
+        printk(KERN_ERR "Global Recoverable FIR  : 0x%016llx\n",
                in_be64(&pregs->checkstop_fir));
-        printk(KERN_ERR "Global MachineCheck FIR : 0x%016lx\n",
+        printk(KERN_ERR "Global MachineCheck FIR : 0x%016llx\n",
                in_be64(&pregs->spec_att_mchk_fir));
 
         if (iregs == NULL)
                 return;
-        printk(KERN_ERR "IOC FIR                 : 0x%016lx\n",
+        printk(KERN_ERR "IOC FIR                 : 0x%016llx\n",
                in_be64(&iregs->ioc_fir));
 
 }
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index a5bdb89a17c3..e487ad68ac11 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -151,7 +151,7 @@ static inline void spu_load_slb(struct spu *spu, int slbe, struct spu_slb *slb)
 {
         struct spu_priv2 __iomem *priv2 = spu->priv2;
 
-        pr_debug("%s: adding SLB[%d] 0x%016lx 0x%016lx\n",
+        pr_debug("%s: adding SLB[%d] 0x%016llx 0x%016llx\n",
                         __func__, slbe, slb->vsid, slb->esid);
 
         out_be64(&priv2->slb_index_W, slbe);
@@ -221,7 +221,7 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
 {
         int ret;
 
-        pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea);
+        pr_debug("%s, %llx, %lx\n", __func__, dsisr, ea);
 
         /*
          * Handle kernel space hash faults immediately. User hash
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index 19f6bfdbb933..fec1495e6b12 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall_block *s)
         long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
 
         if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
-                pr_debug("%s: invalid syscall #%ld", __func__, s->nr_ret);
+                pr_debug("%s: invalid syscall #%lld", __func__, s->nr_ret);
                 return -ENOSYS;
         }
 
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index af116aadba10..c4d4a19235e0 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -42,7 +42,7 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer,
                 return spufs_coredump_read[num].read(ctx, buffer, size, off);
 
         data = spufs_coredump_read[num].get(ctx);
-        ret = snprintf(buffer, size, "0x%.16lx", data);
+        ret = snprintf(buffer, size, "0x%.16llx", data);
         if (ret >= size)
                 return size;
         return ++ret; /* count trailing NULL */
diff --git a/arch/powerpc/platforms/cell/spufs/fault.c b/arch/powerpc/platforms/cell/spufs/fault.c
index f093a581ac74..a4dd3ae7223a 100644
--- a/arch/powerpc/platforms/cell/spufs/fault.c
+++ b/arch/powerpc/platforms/cell/spufs/fault.c
@@ -132,7 +132,7 @@ int spufs_handle_class1(struct spu_context *ctx)
 
         spuctx_switch_state(ctx, SPU_UTIL_IOWAIT);
 
-        pr_debug("ctx %p: ea %016lx, dsisr %016lx state %d\n", ctx, ea,
+        pr_debug("ctx %p: ea %016llx, dsisr %016llx state %d\n", ctx, ea,
                 dsisr, ctx->state);
 
         ctx->stats.hash_flt++;
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 7106b63d401b..0da7f2bf5ee1 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -1654,7 +1654,7 @@ out:
 
 static int spufs_check_valid_dma(struct mfc_dma_command *cmd)
 {
-        pr_debug("queueing DMA %x %lx %x %x %x\n", cmd->lsa,
+        pr_debug("queueing DMA %x %llx %x %x %x\n", cmd->lsa,
                  cmd->ea, cmd->size, cmd->tag, cmd->cmd);
 
         switch (cmd->cmd) {
@@ -1671,7 +1671,7 @@ static int spufs_check_valid_dma(struct mfc_dma_command *cmd)
         }
 
         if ((cmd->lsa & 0xf) != (cmd->ea &0xf)) {
-                pr_debug("invalid DMA alignment, ea %lx lsa %x\n",
+                pr_debug("invalid DMA alignment, ea %llx lsa %x\n",
                                 cmd->ea, cmd->lsa);
                 return -EIO;
         }
@@ -2633,7 +2633,7 @@ static int spufs_show_ctx(struct seq_file *s, void *private)
         }
 
         seq_printf(s, "%c flgs(%lx) sflgs(%lx) pri(%d) ts(%d) spu(%02d)"
-                " %c %lx %lx %lx %lx %x %x\n",
+                " %c %llx %llx %llx %llx %x %x\n",
                 ctx->state == SPU_STATE_SAVED ? 'S' : 'R',
                 ctx->flags,
                 ctx->sched_flags,