diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-07 05:52:38 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-09 08:11:34 -0400 |
commit | 38c0ff06d5ba05b6fbf18652c49747ad320aaeb0 (patch) | |
tree | ba5fc6fe31c4a24c127d6b6a667c7d3c334b967a /arch/ppc64/kernel/udbg.c | |
parent | 34b5233f379847097a1925a02b62f129c407c1e4 (diff) |
[PATCH] ppc64: iSeries early printk breakage
The earlier commit 8d9273918635f0301368c01b56c03a6f339e8d51
(Consolidate early console and PPCDBG code) broke iSeries because
it caused unregister_console(&udbg_console) to be called
unconditionally. iSeries never registers the udbg_console.
This just reverts part of the change.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/udbg.c')
-rw-r--r-- | arch/ppc64/kernel/udbg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c index ed6766e21f5a..d49c3613c8ec 100644 --- a/arch/ppc64/kernel/udbg.c +++ b/arch/ppc64/kernel/udbg.c | |||
@@ -158,14 +158,20 @@ static struct console udbg_console = { | |||
158 | .index = -1, | 158 | .index = -1, |
159 | }; | 159 | }; |
160 | 160 | ||
161 | static int early_console_initialized; | ||
162 | |||
161 | void __init disable_early_printk(void) | 163 | void __init disable_early_printk(void) |
162 | { | 164 | { |
165 | if (!early_console_initialized) | ||
166 | return; | ||
163 | unregister_console(&udbg_console); | 167 | unregister_console(&udbg_console); |
168 | early_console_initialized = 0; | ||
164 | } | 169 | } |
165 | 170 | ||
166 | /* called by setup_system */ | 171 | /* called by setup_system */ |
167 | void register_early_udbg_console(void) | 172 | void register_early_udbg_console(void) |
168 | { | 173 | { |
174 | early_console_initialized = 1; | ||
169 | register_console(&udbg_console); | 175 | register_console(&udbg_console); |
170 | } | 176 | } |
171 | 177 | ||