diff options
author | Thomas Gleixner | 2018-03-14 20:23:25 +0100 |
---|---|---|
committer | Thomas Gleixner | 2018-03-14 20:23:25 +0100 |
commit | 745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c (patch) | |
tree | e556543ed86b7f49e4972d8ea048ff9e46592b4d /arch/x86/xen | |
parent | x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms (diff) | |
parent | x86/mm: Fix vmalloc_fault to use pXd_large (diff) | |
download | kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.gz kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.tar.xz kernel-qcow2-linux-745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c.zip |
Merge branch 'x86/urgent' into x86/mm to pick up dependencies
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/enlighten_pv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index c047f42552e1..3c2c2530737e 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1376,8 +1376,6 @@ asmlinkage __visible void __init xen_start_kernel(void) if (!xen_initial_domain()) { add_preferred_console("xenboot", 0, NULL); - add_preferred_console("tty", 0, NULL); - add_preferred_console("hvc", 0, NULL); if (pci_xen) x86_init.pci.arch_init = pci_xen_init; } else { @@ -1410,6 +1408,10 @@ asmlinkage __visible void __init xen_start_kernel(void) xen_boot_params_init_edd(); } + + add_preferred_console("tty", 0, NULL); + add_preferred_console("hvc", 0, NULL); + #ifdef CONFIG_PCI /* PCI BIOS service won't work from a PV guest. */ pci_probe &= ~PCI_PROBE_BIOS; |