Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / hyperv / hv_init.c

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index aeb8edf32e2babe606dd8db29147b093baa9c355..189a398290dbb220dcff2bcaa6ef4ebc1ef25ae3 100644 (file)
--- 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;
 
        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 */
                return;
 
        /* Allocate percpu VP index */