aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@suse.de>2007-05-08 03:26:49 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:04 -0400
commit69331af79cf29e26d1231152a172a1a10c2df511 (patch)
tree0c6f805fc78c1969b8c46f02070cb9dc39f3f944 /arch/sh
parent6ae9200f2cab7b328e505fc9a7021db64e0590cf (diff)
Fixes and cleanups for earlyprintk aka boot console
The console subsystem already has an idea of a boot console, using the CON_BOOT flag. The implementation has some flaws though. The major problem is that presence of a boot console makes register_console() ignore any other console devices (unless explicitly specified on the kernel command line). This patch fixes the console selection code to *not* consider a boot console a full-featured one, so the first non-boot console registering will become the default console instead. This way the unregister call for the boot console in the register_console() function actually triggers and the handover from the boot console to the real console device works smoothly. Added a printk for the handover, so you know which console device the output goes to when the boot console stops printing messages. The disable_early_printk() call is obsolete with that patch, explicitly disabling the early console isn't needed any more as it works automagically with that patch. I've walked through the tree, dropped all disable_early_printk() instances found below arch/ and tagged the consoles with CON_BOOT if needed. The code is tested on x86, sh (thanks to Paul) and mips (thanks to Ralf). Changes to last version: Rediffed against -rc3, adapted to mips cleanups by Ralf, fixed "udbg-immortal" cmd line arg on powerpc. Signed-off-by: Gerd Hoffmann <kraxel@exsuse.de> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Cc: Andi Kleen <ak@suse.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/early_printk.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 9048c0326d87..9833493d8867 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -192,20 +192,14 @@ int __init setup_early_printk(char *buf)
192 } 192 }
193#endif 193#endif
194 194
195 if (likely(early_console)) 195 if (likely(early_console)) {
196 if (keep_early)
197 early_console->flags &= ~CON_BOOT;
198 else
199 early_console->flags |= CON_BOOT;
196 register_console(early_console); 200 register_console(early_console);
201 }
197 202
198 return 0; 203 return 0;
199} 204}
200early_param("earlyprintk", setup_early_printk); 205early_param("earlyprintk", setup_early_printk);
201
202void __init disable_early_printk(void)
203{
204 if (!early_console_initialized || !early_console)
205 return;
206 if (!keep_early) {
207 printk("disabling early console\n");
208 unregister_console(early_console);
209 } else
210 printk("keeping early console\n");
211}