diff options
| author | Stefan Bader <stefan.bader@canonical.com> | 2011-09-01 15:23:25 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:59:20 -0600 |
| commit | 8a5d420a60585aaa0a1ac996de4f6737739d6c96 (patch) | |
| tree | 3cfc1d8eb310c41678786d085cf5cd45bb4b177f | |
| parent | 8d757644c87034636fdd13f1024124bcfac5f073 (diff) | |
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 <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
| -rw-r--r-- | arch/x86/xen/enlighten.c | 2 | ||||
| -rw-r--r-- | arch/x86/xen/smp.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 14dc31f2349..57727c50e13 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 e79dbb95482..abd69a6af08 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) |