1 files changed, 2 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 79a17795d17b..191d0ab09222 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -238,12 +238,11 @@ void __init setup_arch(char **cmdline_p)
 
         smp_setup_cpu_maps();
 
-#ifdef CONFIG_XMON_DEFAULT
-        xmon_init(1);
-#endif
         /* Register early console */
         register_early_udbg_console();
 
+        xmon_setup();
+
 #if defined(CONFIG_KGDB)
         if (ppc_md.kgdb_map_scc)
                 ppc_md.kgdb_map_scc();
@@ -280,9 +279,6 @@ void __init setup_arch(char **cmdline_p)
         init_mm.end_data = (unsigned long) _edata;
         init_mm.brk = klimit;
 
-        if (do_early_xmon)
-                debugger(NULL);
-
         /* set up the bootmem stuff with available memory */
         do_init_bootmem();
         if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);