aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2006-10-03 00:12:08 -0400
committerPaul Mackerras <paulus@samba.org>2006-10-04 00:52:22 -0400
commit476792839467c08ddeedd8b44a7423d415b68259 (patch)
tree43f273e48667c611bb3e28e9c6a359dec0d2c068 /include/asm-powerpc
parent23b8acb1cf49fea74a9d431de258787384951eac (diff)
[POWERPC] Fix xmon=off and cleanup xmon initialisation
My patch to make the early xmon logic work with earlier early param parsing (480f6f35a149802a94ad5c1a2673ed6ec8d2c158) breaks xmon=off. No one does this obviously as xmon rocks, but it should really work as documented. While fixing that it struck me that we could move the xmon param handling into xmon.c, and also consolidate the xmon_init()/do_early_xmon logic into xmon_setup(). This means xmon=early drops into xmon a little earlier on 32-bit, but it seems to work just fine. Tested on PSERIES and CLASSIC32. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/xmon.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-powerpc/xmon.h b/include/asm-powerpc/xmon.h
index c02dd0ce13ac..f1d337ed68d5 100644
--- a/include/asm-powerpc/xmon.h
+++ b/include/asm-powerpc/xmon.h
@@ -12,7 +12,11 @@
12 12
13#ifdef __KERNEL__ 13#ifdef __KERNEL__
14 14
15extern void xmon_init(int); 15#ifdef CONFIG_XMON
16extern void xmon_setup(void);
17#else
18static inline void xmon_setup(void) { };
19#endif
16 20
17#endif /* __KERNEL __ */ 21#endif /* __KERNEL __ */
18#endif /* __ASM_POWERPC_XMON_H */ 22#endif /* __ASM_POWERPC_XMON_H */