aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/xen/enlighten_pv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 419ff4641644..a26a11d8d0eb 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -1385,8 +1385,11 @@ asmlinkage __visible void __init xen_start_kernel(void)
1385 xen_boot_params_init_edd(); 1385 xen_boot_params_init_edd();
1386 } 1386 }
1387 1387
1388 add_preferred_console("tty", 0, NULL); 1388 if (!boot_params.screen_info.orig_video_isVGA)
1389 add_preferred_console("tty", 0, NULL);
1389 add_preferred_console("hvc", 0, NULL); 1390 add_preferred_console("hvc", 0, NULL);
1391 if (boot_params.screen_info.orig_video_isVGA)
1392 add_preferred_console("tty", 0, NULL);
1390 1393
1391#ifdef CONFIG_PCI 1394#ifdef CONFIG_PCI
1392 /* PCI BIOS service won't work from a PV guest. */ 1395 /* PCI BIOS service won't work from a PV guest. */