diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 14dc31f..57727c5 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1360,8 +1360,10 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
 	switch (action) {
 	case CPU_UP_PREPARE:
 		per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];
+		/* FIXME: Disable until a final solution is found (lp#838026)
 		if (xen_have_vector_callback)
 			xen_init_lock_cpu(cpu);
+		*/
 		break;
 	default:
 		break;
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index e79dbb9..abd69a6 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -521,8 +521,10 @@ static void __init xen_hvm_smp_prepare_cpus(unsigned int max_cpus)
 	native_smp_prepare_cpus(max_cpus);
 	WARN_ON(xen_smp_intr_init(0));
 
+	/* FIXME: Disable until final solution is found (lp#838026)
 	xen_init_lock_cpu(0);
 	xen_init_spinlocks();
+	*/
 }
 
 static int __cpuinit xen_hvm_cpu_up(unsigned int cpu)