diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
| commit | 99e711101c7822d9ddf39f16c026b97e16a9f517 (patch) | |
| tree | 97f9d3bc19a3595365e68115015e27f1d4e7009d /arch/x86/kernel/cpu/hypervisor.c | |
| parent | f1dc154f82595386cddcc7b980d8760474c3dd2d (diff) | |
| parent | 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff) | |
Merge branch 'linus' into x86/cleanups, before applying dependent patch
Diffstat (limited to 'arch/x86/kernel/cpu/hypervisor.c')
| -rw-r--r-- | arch/x86/kernel/cpu/hypervisor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c index 36ce402a3fa5..d820d8eae96b 100644 --- a/arch/x86/kernel/cpu/hypervisor.c +++ b/arch/x86/kernel/cpu/hypervisor.c @@ -27,8 +27,8 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = { -#ifdef CONFIG_XEN_PVHVM - &x86_hyper_xen_hvm, +#ifdef CONFIG_XEN + &x86_hyper_xen, #endif &x86_hyper_vmware, &x86_hyper_ms_hyperv, |