diff options
author | Thomas Gleixner <[email protected]> | 2013-04-29 16:17:18 -0700 |
---|---|---|
committer | Linus Torvalds <[email protected]> | 2013-04-29 18:28:13 -0700 |
commit | d0380e6c3c0f6edb986d8798a23acfaf33d5df23 (patch) | |
tree | 454ea23060995d2e1326962cedfd6e86a335629d /arch/um/kernel/early_printk.c | |
parent | 07c65f4d1aa74f7cf1c46d7f96e05cfa3e628ba1 (diff) |
early_printk: consolidate random copies of identical code
The early console implementations are the same all over the place. Move
the print function to kernel/printk and get rid of the copies.
[[email protected]: arch/mips/kernel/early_printk.c needs kernel.h for va_list]
[[email protected]: sh4: make the bios early console support depend on EARLY_PRINTK]
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Paul Gortmaker <[email protected]>
Cc: Russell King <[email protected]>
Acked-by: Mike Frysinger <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Chris Metcalf <[email protected]>
Cc: Richard Weinberger <[email protected]>
Reviewed-by: Ingo Molnar <[email protected]>
Tested-by: Paul Gortmaker <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'arch/um/kernel/early_printk.c')
-rw-r--r-- | arch/um/kernel/early_printk.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c index 49480f092456..4a0800bc37b2 100644 --- a/arch/um/kernel/early_printk.c +++ b/arch/um/kernel/early_printk.c @@ -16,7 +16,7 @@ static void early_console_write(struct console *con, const char *s, unsigned int um_early_printk(s, n); } -static struct console early_console = { +static struct console early_console_dev = { .name = "earlycon", .write = early_console_write, .flags = CON_BOOT, @@ -25,8 +25,10 @@ static struct console early_console = { static int __init setup_early_printk(char *buf) { - register_console(&early_console); - + if (!early_console) { + early_console = &early_console_dev; + register_console(&early_console_dev); + } return 0; } |