From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 1 Jun 2012 16:21:19 +0000 (+0100)
Subject: ARM: enable earlyprintk="xen"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9ece9065d8b3a746ae2800c866a014c20dc7b863;p=people%2Fsstabellini%2Flinux-pvhvm-deprecated.git

ARM: enable earlyprintk="xen"

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/arch/arm/kernel/early_printk.c b/arch/arm/kernel/early_printk.c
index 85aa2b29269..5837d7dfffe 100644
--- a/arch/arm/kernel/early_printk.c
+++ b/arch/arm/kernel/early_printk.c
@@ -11,6 +11,8 @@
 #include <linux/kernel.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <xen/hvc-console.h>
 
 extern void printch(int);
 
@@ -50,7 +52,12 @@ asmlinkage void early_printk(const char *fmt, ...)
 
 static int __init setup_early_printk(char *buf)
 {
-	register_console(&early_console);
+#ifdef CONFIG_HVC_XEN
+	if (!strncmp(buf, "xen", 3))
+		register_console(&xenboot_console);
+	else
+#endif
+		register_console(&early_console);
 	return 0;
 }