early-printk-consolidate.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
c542955a21
commit
ba6b9a4b8c
|
@ -309,6 +309,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
|
|
||||||
boot_flags_init(*cmdline_p);
|
boot_flags_init(*cmdline_p);
|
||||||
|
|
||||||
|
early_console = &prom_early_console;
|
||||||
register_console(&prom_early_console);
|
register_console(&prom_early_console);
|
||||||
|
|
||||||
printk("ARCH: ");
|
printk("ARCH: ");
|
||||||
|
|
|
@ -575,6 +575,12 @@ static void __init init_sparc64_elf_hwcap(void)
|
||||||
pause_patch();
|
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)
|
void __init setup_arch(char **cmdline_p)
|
||||||
{
|
{
|
||||||
/* Initialize PROM console and command line. */
|
/* Initialize PROM console and command line. */
|
||||||
|
@ -586,7 +592,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
#ifdef CONFIG_EARLYFB
|
#ifdef CONFIG_EARLYFB
|
||||||
if (btext_find_display())
|
if (btext_find_display())
|
||||||
#endif
|
#endif
|
||||||
register_console(&prom_early_console);
|
register_prom_console();
|
||||||
|
|
||||||
if (tlb_type == hypervisor)
|
if (tlb_type == hypervisor)
|
||||||
printk("ARCH: SUN4V\n");
|
printk("ARCH: SUN4V\n");
|
||||||
|
|
Loading…
Reference in New Issue