[PATCH] ppc64: allow xmon=off

If both CONFIG_XMON and CONFIG_XMON_DEFAULT is enabled in the .config,
there is no way to disable xmon again. setup_system calls first xmon_init,
later parse_early_param. So a new 'xmon=off' cmdline option will do the right
thing.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index e9c24d2dbd91..b3ef8df12982 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -627,7 +627,7 @@ void __init setup_system(void)
          * Initialize xmon
          */
 #ifdef CONFIG_XMON_DEFAULT
-        xmon_init();
+        xmon_init(1);
 #endif
         /*
          * Register early console
@@ -1343,11 +1343,13 @@ static int __init early_xmon(char *p)
         /* ensure xmon is enabled */
         if (p) {
                 if (strncmp(p, "on", 2) == 0)
-                        xmon_init();
+                        xmon_init(1);
+                if (strncmp(p, "off", 3) == 0)
+                        xmon_init(0);
                 if (strncmp(p, "early", 5) != 0)
                         return 0;
         }
-        xmon_init();
+        xmon_init(1);
         debugger(NULL);
 
         return 0;