1 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6018178708a5..008ab6823b02 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -181,9 +181,9 @@ void __init early_setup(unsigned long dt_ptr)
         DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
 
         /*
-         * Do early initializations using the flattened device
-         * tree, like retreiving the physical memory map or
-         * calculating/retreiving the hash table size
+         * Do early initialization using the flattened device
+         * tree, such as retrieving the physical memory map or
+         * calculating/retrieving the hash table size.
          */
         early_init_devtree(__va(dt_ptr));
 
@@ -530,7 +530,8 @@ void __init setup_arch(char **cmdline_p)
         conswitchp = &dummy_con;
 #endif
 
-        ppc_md.setup_arch();
+        if (ppc_md.setup_arch)
+                ppc_md.setup_arch();
 
         paging_init();
         ppc64_boot_msg(0x15, "Setup Done");