diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 09:04:08 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:05 (GMT) |
| commit | 90f73aa79422e1d1e69d2713a6153980f89e03c4 (patch) | |
| tree | d375d0a2f9e01c3fd8a32a5dd9eba16e37de72bc /arch/unicore32 | |
| parent | 639c3b9809d2202a2fd4c212d32d137d80c49fed (diff) | |
| download | linux-fsl-qoriq-90f73aa79422e1d1e69d2713a6153980f89e03c4.tar.xz | |
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 3922255..9be0d5d 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; |