diff options
| author | Ingo Molnar <[email protected]> | 2017-12-01 09:34:04 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-12-17 12:50:01 +0000 |
| commit | e5d77a73f364ba0e3e3d6c72c334324bb12e04fc (patch) | |
| tree | a3feefe8605f022dd974fbaddb10c7b992c58408 /arch/x86/hyperv/hv_init.c | |
| parent | Merge branch 'upstream-acpi-fixes' into WIP.x86/pti.base (diff) | |
| parent | x86/virt: Add enum for hypervisors to replace x86_hyper (diff) | |
| download | kernel-e5d77a73f364ba0e3e3d6c72c334324bb12e04fc.tar.gz kernel-e5d77a73f364ba0e3e3d6c72c334324bb12e04fc.zip | |
Merge commit 'upstream-x86-virt' into WIP.x86/mm
Merge a minimal set of virt cleanups, for a base for the MM isolation patches.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/x86/hyperv/hv_init.c')
| -rw-r--r-- | arch/x86/hyperv/hv_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index a5db63f728a2..a0b86cf486e0 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -113,7 +113,7 @@ void hyperv_init(void) u64 guest_id; union hv_x64_msr_hypercall_contents hypercall_msr; - if (x86_hyper != &x86_hyper_ms_hyperv) + if (x86_hyper_type != X86_HYPER_MS_HYPERV) return; /* Allocate percpu VP index */ |