diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 11:04:08 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:00:12 -0600 |
| commit | e6e38c48997d990a9f86ede7311f7c0bfe384897 (patch) | |
| tree | 38d534db7d8e7c8c32b45ff85cc962d7f50275b0 /arch/um | |
| parent | 8de3e929d4157478bb02c02986cfdc0861e60df2 (diff) | |
early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/um')
| -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 ec649bf72f68..183060f76a11 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; } |