46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
Subject: early-printk-consolidate.patch
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sat, 23 Jul 2011 11:04:08 +0200
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.12/patches-3.12.0-rt2.tar.xz
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/sparc/kernel/setup_32.c | 1 +
|
|
arch/sparc/kernel/setup_64.c | 8 +++++++-
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
--- 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: ");
|
|
--- a/arch/sparc/kernel/setup_64.c
|
|
+++ b/arch/sparc/kernel/setup_64.c
|
|
@@ -555,6 +555,12 @@ static void __init init_sparc64_elf_hwca
|
|
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");
|