aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/xen/enlighten.c1
-rw-r--r--drivers/char/hvc_xen.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 6cfb708408e9..5c0635a8bffd 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1257,6 +1257,7 @@ asmlinkage void __init xen_start_kernel(void)
1257 boot_params.hdr.ramdisk_size = xen_start_info->mod_len; 1257 boot_params.hdr.ramdisk_size = xen_start_info->mod_len;
1258 1258
1259 if (!is_initial_xendomain()) { 1259 if (!is_initial_xendomain()) {
1260 add_preferred_console("xenboot", 0, NULL);
1260 add_preferred_console("tty", 0, NULL); 1261 add_preferred_console("tty", 0, NULL);
1261 add_preferred_console("hvc", 0, NULL); 1262 add_preferred_console("hvc", 0, NULL);
1262 } 1263 }
diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c
index 2413af342a81..d5fe0a8952fa 100644
--- a/drivers/char/hvc_xen.c
+++ b/drivers/char/hvc_xen.c
@@ -155,6 +155,7 @@ static void xenboot_write_console(struct console *console, const char *string,
155 155
156 raw_console_write(string, len); 156 raw_console_write(string, len);
157 157
158 write_console(0, "(early) ", 8);
158 while (off < len && NULL != (pos = strchr(string+off, '\n'))) { 159 while (off < len && NULL != (pos = strchr(string+off, '\n'))) {
159 linelen = pos-string+off; 160 linelen = pos-string+off;
160 if (off + linelen > len) 161 if (off + linelen > len)