Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (194 commits)
  [POWERPC] Add missing EXPORTS for mpc52xx support
  [POWERPC] Remove obsolete PPC_52xx and update CLASSIC32 comment
  [POWERPC] ps3: add a default zImage target
  [POWERPC] Add of_platform_bus support to mpc52xx psc uart driver
  [POWERPC] typo fix and whitespace cleanup on mpc52xx-uart driver
  [POWERPC] Fix debug printks for 32-bit resources in the PCI code
  [POWERPC] Replace kmalloc+memset with kzalloc
  [POWERPC] Linkstation / kurobox support
  [POWERPC] Add the e300c3 core to the CPU table.
  [POWERPC] ppc: m48t35 add missing bracket
  [POWERPC] iSeries: don't build head_64.o unnecessarily
  [POWERPC] iSeries: stop dt_mod.o being rebuilt unnecessarily
  [POWERPC] Fix cputable.h for combined build
  [POWERPC] Allow CONFIG_BOOTX_TEXT on iSeries
  [POWERPC] Allow xmon to build on legacy iSeries
  [POWERPC] Change ppc64_defconfig to use AUTOFS_V4 not V3
  [POWERPC] Tell firmware we can handle POWER6 compatible mode
  [POWERPC] Clean images in arch/powerpc/boot
  [POWERPC] Fix OF pci flags parsing
  [POWERPC] defconfig for lite5200 board
  ...

1 files changed, 14 insertions, 11 deletions

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index e8fa50624b70..03aeb3a46077 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -426,18 +426,21 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
 
         /* kernel has accessed a bad area */
 
-        printk(KERN_ALERT "Unable to handle kernel paging request for ");
         switch (regs->trap) {
-                case 0x300:
-                case 0x380:
-                        printk("data at address 0x%08lx\n", regs->dar);
-                        break;
-                case 0x400:
-                case 0x480:
-                        printk("instruction fetch\n");
-                        break;
-                default:
-                        printk("unknown fault\n");
+        case 0x300:
+        case 0x380:
+                printk(KERN_ALERT "Unable to handle kernel paging request for "
+                        "data at address 0x%08lx\n", regs->dar);
+                break;
+        case 0x400:
+        case 0x480:
+                printk(KERN_ALERT "Unable to handle kernel paging request for "
+                        "instruction fetch\n");
+                break;
+        default:
+                printk(KERN_ALERT "Unable to handle kernel paging request for "
+                        "unknown fault\n");
+                break;
         }
         printk(KERN_ALERT "Faulting instruction address: 0x%08lx\n",
                 regs->nip);