Merge branch 'x86/cpu' into perf/core, to resolve conflict

[linux-block.git] / arch / x86 / kvm / vmx / vmx.c

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 26f8f31563e9b7b766d2fdbda135592085b3f148..967bc1eace3fd3819ea4a10a5182b5dae80d56af 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -31,6 +31,7 @@
 #include <asm/apic.h>
 #include <asm/asm.h>
 #include <asm/cpu.h>
+#include <asm/cpu_device_id.h>
 #include <asm/debugreg.h>
 #include <asm/desc.h>
 #include <asm/fpu/internal.h>
@@ -66,7 +67,7 @@ MODULE_LICENSE("GPL");
 
 #ifdef MODULE
 static const struct x86_cpu_id vmx_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_VMX),
+       X86_MATCH_FEATURE(X86_FEATURE_VMX, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id);