diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-23 11:04:08 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-13 12:39:52 -0500 |
| commit | 7659032d9a0e9f8b503c618f0df3726087642448 (patch) | |
| tree | 92bce0283cc197363bca4d181c8720a9aa51c911 /arch/sparc | |
| parent | d9d724090c60791cad05a1aa0b891fd7431e9e31 (diff) | |
early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/sparc')
| -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 fe1e3fc31bc5..e6475f03231d 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -221,6 +221,7 @@ void __init setup_arch(char **cmdline_p) boot_flags_init(*cmdline_p); + early_console = &prom_early_console; register_console(&prom_early_console); /* Set sparc_cpu_model */ diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index a854a1c240ff..b85d039678af 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -487,6 +487,12 @@ static void __init init_sparc64_elf_hwcap(void) popc_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. */ @@ -498,7 +504,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"); |