diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-28 08:53:37 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-28 08:53:37 -0400 |
commit | f78541dcec327b0c46b150ee7d727f3db80275c4 (patch) | |
tree | 9336801742d93ffa0c84c76e2b3cdc5b50c7125b /arch/powerpc/kernel/setup_32.c | |
parent | c032524f0ddea5fcc3a2cece0d4a61f37e5ca9cd (diff) |
powerpc: Merge xmon
The merged version follows the ppc64 version pretty closely mostly,
and in fact ARCH=ppc64 now uses the arch/powerpc/xmon version.
The main difference for ppc64 is that the 'p' command to call
show_state (which was always pretty dodgy) has been replaced by
the ppc32 'p' command, which calls a given procedure (so in fact
the old 'p' command behaviour can be achieved with 'p $show_state').
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 7c99e6b8c76c..9680ae99b084 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -302,8 +302,10 @@ void __init setup_arch(char **cmdline_p) | |||
302 | 302 | ||
303 | #ifdef CONFIG_XMON | 303 | #ifdef CONFIG_XMON |
304 | xmon_map_scc(); | 304 | xmon_map_scc(); |
305 | if (strstr(cmd_line, "xmon")) | 305 | if (strstr(cmd_line, "xmon")) { |
306 | xmon(NULL); | 306 | xmon_init(1); |
307 | debugger(NULL); | ||
308 | } | ||
307 | #endif /* CONFIG_XMON */ | 309 | #endif /* CONFIG_XMON */ |
308 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: enter", 0x3eab); | 310 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: enter", 0x3eab); |
309 | 311 | ||