From: Arve Hjønnevåg <arve@android.com>
Date: Sat, 15 Jun 2013 02:54:40 +0000 (-0700)
Subject: ARM: Fix "Make low-level printk work" to use a separate config option
X-Git-Tag: firefly_0821_release~6435
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70327d84e7e6857f1469a4c5b1c2475efe3b3a1a;p=firefly-linux-kernel-4.4.55.git

ARM: Fix "Make low-level printk work" to use a separate config option

Signed-off-by: Arve Hjønnevåg <arve@android.com>

Conflicts:
	kernel/printk.c
---

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index e8de34b5925f..31508289061d 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -698,6 +698,14 @@ config EARLY_PRINTK
 	  kernel low-level debugging functions. Add earlyprintk to your
 	  kernel parameters to enable this console.
 
+config EARLY_PRINTK_DIRECT
+	bool "Early printk direct"
+	depends on DEBUG_LL
+	help
+	  Say Y here if you want to have an early console using the
+	  kernel low-level debugging functions and EARLY_PRINTK is
+	  not early enough.
+
 config OC_ETM
 	bool "On-chip ETM and ETB"
 	depends on ARM_AMBA
diff --git a/kernel/printk.c b/kernel/printk.c
index d37d45c90ae6..51cc2e980290 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -51,6 +51,10 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/printk.h>
 
+#ifdef CONFIG_EARLY_PRINTK_DIRECT
+extern void printascii(char *);
+#endif
+
 /* printk's without a loglevel use this.. */
 #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
 
@@ -1578,6 +1582,10 @@ asmlinkage int vprintk_emit(int facility, int level,
 		}
 	}
 
+#ifdef CONFIG_EARLY_PRINTK_DIRECT
+	printascii(text);
+#endif
+
 	if (level == -1)
 		level = default_message_loglevel;