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

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

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 91000501756ec04214ca14f6083440d2a351d1a4..eedf815c0a32f4baf35ff65d43352f4555709343 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -48,6 +48,7 @@
 #include <asm/kvm_para.h>
 #include <asm/irq_remapping.h>
 #include <asm/spec-ctrl.h>
+#include <asm/cpu_device_id.h>
 
 #include <asm/virtext.h>
 #include "trace.h"
@@ -59,7 +60,7 @@ MODULE_LICENSE("GPL");
 
 #ifdef MODULE
 static const struct x86_cpu_id svm_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_SVM),
+       X86_MATCH_FEATURE(X86_FEATURE_SVM, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, svm_cpu_id);