1 files changed, 14 insertions, 9 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 813c2cd194c2..0d0887844501 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -397,6 +397,11 @@ static void __init __attribute__((noreturn)) prom_panic(const char *reason)
         reason = PTRRELOC(reason);
 #endif
         prom_print(reason);
+        /* Do not call exit because it clears the screen on pmac
+         * it also causes some sort of double-fault on early pmacs */
+        if (RELOC(of_platform) == PLATFORM_POWERMAC)
+                asm("trap\n");
+
         /* ToDo: should put up an SRC here on p/iSeries */
         call_prom("exit", 0, 0);
 
@@ -2060,15 +2065,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          */
         prom_init_stdout();
 
-        /* Bail if this is a kdump kernel. */
-        if (PHYSICAL_START > 0)
-                prom_panic("Error: You can't boot a kdump kernel from OF!\n");
-
-        /*
-         * Check for an initrd
-         */
-        prom_check_initrd(r3, r4);
-
         /*
          * Get default machine type. At this point, we do not differentiate
          * between pSeries SMP and pSeries LPAR
@@ -2078,6 +2074,15 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         prom_setprop(_prom->chosen, "/chosen", "linux,platform",
                      &getprop_rval, sizeof(getprop_rval));
 
+        /* Bail if this is a kdump kernel. */
+        if (PHYSICAL_START > 0)
+                prom_panic("Error: You can't boot a kdump kernel from OF!\n");
+
+        /*
+         * Check for an initrd
+         */
+        prom_check_initrd(r3, r4);
+
 #ifdef CONFIG_PPC_PSERIES
         /*
          * On pSeries, inform the firmware about our capabilities