diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2016-10-02 18:45:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2016-10-05 10:32:22 +0100 |
| commit | 565fdc6a2afeb14e654a8d9ebc792afb9d2c0019 (patch) | |
| tree | f9ca1605b6adbbb6c4e56cf17b3dd2e30fcea5fb /arch/x86 | |
| parent | b057878b2aadc7e06280e7e702a36e7adb1bcdf7 (diff) | |
| download | linux-565fdc6a2afeb14e654a8d9ebc792afb9d2c0019.tar.gz | |
xen/x86: Initialize per_cpu(xen_vcpu, 0) a little earlier
xen_cpuhp_setup() calls mutex_lock() which, when CONFIG_DEBUG_MUTEXES is defined, ends up calling xen_save_fl(). That routine expects per_cpu(xen_vcpu, 0) to be already initialized. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Reported-by: Sander Eikelenboom <linux@eikelenboom.it> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 366b6aed4a8e..96c2dea798a1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1644,7 +1644,6 @@ asmlinkage __visible void __init xen_start_kernel(void) xen_initial_gdt = &per_cpu(gdt_page, 0); xen_smp_init(); - WARN_ON(xen_cpuhp_setup()); #ifdef CONFIG_ACPI_NUMA /* @@ -1658,6 +1657,8 @@ asmlinkage __visible void __init xen_start_kernel(void) possible map and a non-dummy shared_info. */ per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; + WARN_ON(xen_cpuhp_setup()); + local_irq_disable(); early_boot_irqs_disabled = true; |