1 files changed, 5 insertions, 2 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 27ee26aedf94..c0388220cf97 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -25,6 +25,7 @@
 #include <linux/mm.h>
 #include <linux/page-flags.h>
 #include <linux/highmem.h>
+#include <linux/console.h>
 
 #include <xen/interface/xen.h>
 #include <xen/interface/physdev.h>
@@ -889,7 +890,6 @@ void __init xen_setup_vcpu_info_placement(void)
                 pv_irq_ops.irq_disable = xen_irq_disable_direct;
                 pv_irq_ops.irq_enable = xen_irq_enable_direct;
                 pv_mmu_ops.read_cr2 = xen_read_cr2_direct;
-                pv_cpu_ops.iret = xen_iret_direct;
         }
 }
 
@@ -993,7 +993,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
         .read_tsc = native_read_tsc,
         .read_pmc = native_read_pmc,
 
-        .iret = (void *)&hypercall_page[__HYPERVISOR_iret],
+        .iret = xen_iret,
         .irq_enable_syscall_ret = NULL,  /* never called */
 
         .load_tr_desc = paravirt_nop,
@@ -1228,6 +1228,9 @@ asmlinkage void __init xen_start_kernel(void)
                 ? __pa(xen_start_info->mod_start) : 0;
         boot_params.hdr.ramdisk_size = xen_start_info->mod_len;
 
+        if (!is_initial_xendomain())
+                add_preferred_console("hvc", 0, NULL);
+
         /* Start the world */
         start_kernel();
 }