1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index da8afd576a6b..1f928659c338 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1356,7 +1356,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
         int cpu = (long)hcpu;
         switch (action) {
         case CPU_UP_PREPARE:
-                per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];
+                xen_vcpu_setup(cpu);
                 if (xen_have_vector_callback)
                         xen_init_lock_cpu(cpu);
                 break;
@@ -1386,7 +1386,6 @@ static void __init xen_hvm_guest_init(void)
         xen_hvm_smp_init();
         register_cpu_notifier(&xen_hvm_cpu_notifier);
         xen_unplug_emulated_devices();
-        have_vcpu_info_placement = 0;
         x86_init.irqs.intr_init = xen_init_IRQ;
         xen_hvm_init_time_ops();
         xen_hvm_init_mmu_ops();