diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:31:23 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-14 22:31:23 (GMT) |
| commit | 4de5167ee07f7a9b66d999e40f2c3193d1a08add (patch) | |
| tree | 6458e3c033ace5f623046b92f90be9408db5deec /arch/x86/kernel/cpu/hypervisor.c | |
| parent | b9a5e5e18fbf223502c0b2264c15024e393da928 (diff) | |
| parent | ff284f37fc0e6f3b51ede85c5944d571b640ac0f (diff) | |
| download | linux-4de5167ee07f7a9b66d999e40f2c3193d1a08add.tar.xz | |
Merge branches 'acpi-init' and 'acpica'
* acpi-init:
ACPI / init: Fix the ordering of acpi_reserve_resources()
* acpica:
Revert "ACPICA: Permanently set _REV to the value '2'."
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 36ce402..d820d8e 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, |