From 3135c55763efc7c8274c70d4eb1fc6becdaaabe0 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Thu, 1 Sep 2011 15:23:25 +0200 Subject: UBUNTU: SAUCE: xen: Do not use pv spinlocks on HVM BugLink: http://bugs.launchpad.net/bugs/838026 This is broken at the moment and causes our 3.0 kernel to hang on boot when started as a HVM guest of a 4.1.1 or newer hypervisor. It should be reverted or dropped as soon as we find a proper solution. Signed-off-by: Stefan Bader Signed-off-by: Tim Gardner --- arch/x86/xen/enlighten.c | 2 ++ arch/x86/xen/smp.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'arch') diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ded13ebbb4f..c53601764fe 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1378,8 +1378,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 041d4fe9dfe..ad59bf907b0 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -531,7 +531,9 @@ 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); + */ } static int __cpuinit xen_hvm_cpu_up(unsigned int cpu) -- cgit v1.2.3