diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 11:04:08 +0200 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-06-06 15:23:42 -0500 |
| commit | 18e639a3efca3050b8d2141b4f326a6bf95b1313 (patch) | |
| tree | b4fc13668485463f05deecec631509d4af2a065e /arch | |
| parent | 54442ac0b6ee4d7415ac8c79c0e4b3130b6b3e63 (diff) | |
early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/setup_32.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/setup_64.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 1434526970a6..0884ccd78fc3 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -309,6 +309,7 @@ void __init setup_arch(char **cmdline_p) boot_flags_init(*cmdline_p); + early_console = &prom_early_console; register_console(&prom_early_console); printk("ARCH: "); diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 3fdb455e3318..4306d44f034d 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -555,6 +555,12 @@ static void __init init_sparc64_elf_hwcap(void) pause_patch(); } +static inline void register_prom_console(void) +{ + early_console = &prom_early_console; + register_console(&prom_early_console); +} + void __init setup_arch(char **cmdline_p) { /* Initialize PROM console and command line. */ @@ -566,7 +572,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EARLYFB if (btext_find_display()) #endif - register_console(&prom_early_console); + register_prom_console(); if (tlb_type == hypervisor) printk("ARCH: SUN4V\n"); |