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 | |
| parent | 9dabbfbab312909782b26580d71e3977622fab6e (diff) | |
| download | blackbird-op-linux-480f6f35a149802a94ad5c1a2673ed6ec8d2c158.tar.gz blackbird-op-linux-480f6f35a149802a94ad5c1a2673ed6ec8d2c158.zip | |
[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')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 3 |
4 files changed, 9 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 88de557fe046..bd328123af75 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; } diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h index e67066c1933e..4c67ad7fae08 100644 --- a/arch/powerpc/kernel/setup.h +++ b/arch/powerpc/kernel/setup.h @@ -4,5 +4,6 @@ void check_for_initrd(void); void do_init_bootmem(void); void setup_panic(void); +extern int do_early_xmon; #endif /* _POWERPC_KERNEL_SETUP_H */ diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 88832b3ee661..2b6cacb6946f 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -297,6 +297,9 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); + 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); diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index ab6ea37a77aa..a1923d917b30 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -419,6 +419,9 @@ void __init setup_system(void) parse_early_param(); + if (do_early_xmon) + debugger(NULL); + check_smt_enabled(); smp_setup_cpu_maps(); |
