diff options
author | Gerd Hoffmann <kraxel@suse.de> | 2007-05-08 03:26:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:04 -0400 |
commit | 69331af79cf29e26d1231152a172a1a10c2df511 (patch) | |
tree | 0c6f805fc78c1969b8c46f02070cb9dc39f3f944 /drivers/char/tty_io.c | |
parent | 6ae9200f2cab7b328e505fc9a7021db64e0590cf (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 'drivers/char/tty_io.c')
-rw-r--r-- | drivers/char/tty_io.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 389da364e6b6..730cbd209a12 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -141,8 +141,6 @@ static DECLARE_MUTEX(allocated_ptys_lock); | |||
141 | static int ptmx_open(struct inode *, struct file *); | 141 | static int ptmx_open(struct inode *, struct file *); |
142 | #endif | 142 | #endif |
143 | 143 | ||
144 | extern void disable_early_printk(void); | ||
145 | |||
146 | static void initialize_tty_struct(struct tty_struct *tty); | 144 | static void initialize_tty_struct(struct tty_struct *tty); |
147 | 145 | ||
148 | static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *); | 146 | static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *); |
@@ -3897,9 +3895,6 @@ void __init console_init(void) | |||
3897 | * set up the console device so that later boot sequences can | 3895 | * set up the console device so that later boot sequences can |
3898 | * inform about problems etc.. | 3896 | * inform about problems etc.. |
3899 | */ | 3897 | */ |
3900 | #ifdef CONFIG_EARLY_PRINTK | ||
3901 | disable_early_printk(); | ||
3902 | #endif | ||
3903 | call = __con_initcall_start; | 3898 | call = __con_initcall_start; |
3904 | while (call < __con_initcall_end) { | 3899 | while (call < __con_initcall_end) { |
3905 | (*call)(); | 3900 | (*call)(); |