2 files changed, 12 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 4d5fd1dbd400..044b4e6e8743 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -90,7 +90,7 @@ mpc5200_setup_xlb_arbiter(void)
         of_node_put(np);
         if (!xlb) {
                 printk(KERN_ERR __FILE__ ": "
-                        "Error mapping XLB in mpc52xx_setup_cpu().  "
+                        "Error mapping XLB in mpc52xx_setup_cpu(). "
                         "Expect some abnormal behavior\n");
                 return;
         }
@@ -216,7 +216,8 @@ mpc52xx_restart(char *cmd)
                 out_be32(&mpc52xx_wdt->count, 0x000000ff);
                 out_be32(&mpc52xx_wdt->mode, 0x00009004);
         } else
-                printk("mpc52xx_restart: Can't access wdt. "
+                printk(KERN_ERR __FILE__ ": "
+                        "mpc52xx_restart: Can't access wdt. "
                         "Restart impossible, system halted.\n");
 
         while (1);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 5a382bb15f62..b49a18527661 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -265,8 +265,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,
         /* Memory windows */
         res = &hose->mem_resources[0];
         if (res->flags) {
-                pr_debug("mem_resource[0] = {.start=%x, .end=%x, .flags=%lx}\n",
-                         res->start, res->end, res->flags);
+                pr_debug("mem_resource[0] = "
+                         "{.start=%llx, .end=%llx, .flags=%llx}\n",
+                         (unsigned long long)res->start,
+                         (unsigned long long)res->end,
+                         (unsigned long long)res->flags);
                 out_be32(&pci_regs->iw0btar,
                          MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,
                                   res->end - res->start + 1));
@@ -297,9 +300,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,
                 printk(KERN_ERR "%s: Didn't find IO resources\n", __FILE__);
                 return;
         }
-        pr_debug(".io_resource={.start=%x,.end=%x,.flags=%lx} "
+        pr_debug(".io_resource={.start=%llx,.end=%llx,.flags=%llx} "
                  ".io_base_phys=0x%p\n",
-                 res->start, res->end, res->flags, (void*)hose->io_base_phys);
+                 (unsigned long long)res->start,
+                 (unsigned long long)res->end,
+                 (unsigned long long)res->flags, (void*)hose->io_base_phys);
         out_be32(&pci_regs->iw2btar,
                  MPC52xx_PCI_IWBTAR_TRANSLATION(hose->io_base_phys,
                                                 res->start,