aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc64/kernel')
-rw-r--r--arch/ppc64/kernel/setup.c8
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)
627 * Initialize xmon 627 * Initialize xmon
628 */ 628 */
629#ifdef CONFIG_XMON_DEFAULT 629#ifdef CONFIG_XMON_DEFAULT
630 xmon_init(); 630 xmon_init(1);
631#endif 631#endif
632 /* 632 /*
633 * Register early console 633 * Register early console
@@ -1343,11 +1343,13 @@ static int __init early_xmon(char *p)
1343 /* ensure xmon is enabled */ 1343 /* ensure xmon is enabled */
1344 if (p) { 1344 if (p) {
1345 if (strncmp(p, "on", 2) == 0) 1345 if (strncmp(p, "on", 2) == 0)
1346 xmon_init(); 1346 xmon_init(1);
1347 if (strncmp(p, "off", 3) == 0)
1348 xmon_init(0);
1347 if (strncmp(p, "early", 5) != 0) 1349 if (strncmp(p, "early", 5) != 0)
1348 return 0; 1350 return 0;
1349 } 1351 }
1350 xmon_init(); 1352 xmon_init(1);
1351 debugger(NULL); 1353 debugger(NULL);
1352 1354
1353 return 0; 1355 return 0;