diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 11:04:08 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-07 16:14:52 -0600 |
commit | 7ef7deb04adc9958975d075c9f442c4341a7b84d (patch) | |
tree | dcd966a3168134b5ef04cc55e9fe3132c5bb90fc /arch/unicore32 | |
parent | f48c6667aaa05c379f03d2a1dfa8cef85ee84d74 (diff) |
early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/kernel/early_printk.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/unicore32/kernel/early_printk.c b/arch/unicore32/kernel/early_printk.c index 3922255f1fa8..9be0d5d02a9a 100644 --- a/arch/unicore32/kernel/early_printk.c +++ b/arch/unicore32/kernel/early_printk.c @@ -33,21 +33,17 @@ static struct console early_ocd_console = { .index = -1, }; -/* Direct interface for emergencies */ -static struct console *early_console = &early_ocd_console; - -static int __initdata keep_early; - static int __init setup_early_printk(char *buf) { - if (!buf) + int keep_early; + + if (!buf || early_console) return 0; if (strstr(buf, "keep")) keep_early = 1; - if (!strncmp(buf, "ocd", 3)) - early_console = &early_ocd_console; + early_console = &early_ocd_console; if (keep_early) early_console->flags &= ~CON_BOOT; |