diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-05-17 18:00:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 15:02:12 +1000 |
| commit | 480f6f35a149802a94ad5c1a2673ed6ec8d2c158 (patch) | |
| tree | b0cded201abfbc7c6a1c5bfa316e6fecc1e2b507 /arch/powerpc/kernel/setup-common.c | |
| parent | 9dabbfbab312909782b26580d71e3977622fab6e (diff) | |
[PATCH] powerpc: Make early xmon logic immune to location of early parsing
Currently early_xmon() calls directly into debugger() if xmon=early is passed.
This ties the invocation of early xmon to the location of parse_early_param(),
which might change.
Tested on P5 LPAR and F50.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 88de557fe04..bd328123af7 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -443,6 +443,7 @@ void __init smp_setup_cpu_maps(void) } #endif /* CONFIG_SMP */ +int __initdata do_early_xmon; #ifdef CONFIG_XMON static int __init early_xmon(char *p) { @@ -456,7 +457,7 @@ static int __init early_xmon(char *p) return 0; } xmon_init(1); - debugger(NULL); + do_early_xmon = 1; return 0; } |