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

Conflicts:
	arch/x86/events/intel/uncore.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/events/intel/uncore.c
index 63922e3a34f54462b58a63c4a37a8259a304b0f6,ac93705a2127c874488388d96f0f4f85b311e8ee..1ba72c563313a115b874262aa5811de36830da76
--- 1/arch/x86/events/intel/uncore.c
--- 2/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@@ -1487,40 -1473,37 +1483,39 @@@ static const struct intel_uncore_init_f
  };
  
  static const struct x86_cpu_id intel_uncore_match[] __initconst = {
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EP,     nhm_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM,        nhm_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE,       nhm_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EP,    nhm_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE,    snb_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE,      ivb_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL,        hsw_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_L,      hsw_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_G,      hsw_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL,      bdw_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_G,    bdw_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE_X,  snbep_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EX,     nhmex_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EX,    nhmex_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE_X,    ivbep_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_X,      hswep_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_X,    bdx_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_D,    bdx_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL,   knl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM,   knl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE,        skl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L,      skl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,      skx_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_L,     skl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE,       skl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_L,      icl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_NNPI,   icl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE,        icl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_TIGERLAKE_L,    tgl_l_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_TIGERLAKE,      tgl_uncore_init),
-       X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_D, snr_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP,          &nhm_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(NEHALEM,             &nhm_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(WESTMERE,            &nhm_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP,         &nhm_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE,         &snb_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE,           &ivb_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL,             &hsw_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L,           &hsw_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G,           &hsw_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL,           &bdw_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G,         &bdw_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X,       &snbep_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX,          &nhmex_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX,         &nhmex_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X,         &ivbep_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X,           &hswep_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X,         &bdx_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D,         &bdx_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,        &knl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,        &knl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE,             &skl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L,           &skl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X,           &skx_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L,          &skl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE,            &skl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,           &icl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI,        &icl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE,             &icl_uncore_init),
++      X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,         &tgl_l_uncore_init),
++      X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,           &tgl_uncore_init),
+       X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,      &snr_uncore_init),
        {},
  };
- 
  MODULE_DEVICE_TABLE(x86cpu, intel_uncore_match);
  
  static int __init intel_uncore_init(void)

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kvm/svm.c
index 91000501756ec04214ca14f6083440d2a351d1a4,7c959ae20cd4d0aee37106114e5e0751eacd66b1..eedf815c0a32f4baf35ff65d43352f4555709343
--- 1/arch/x86/kvm/svm.c
--- 2/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@@ -57,9 -58,8 +58,9 @@@
  MODULE_AUTHOR("Qumranet");
  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);

diff --cc arch/x86/kvm/vmx/vmx.c
index 26f8f31563e9b7b766d2fdbda135592085b3f148,5b017efcc9440a3d6c479a21dc999727cfab5a33..967bc1eace3fd3819ea4a10a5182b5dae80d56af
--- 1/arch/x86/kvm/vmx/vmx.c
--- 2/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@@ -64,9 -65,8 +65,9 @@@
  MODULE_AUTHOR("Qumranet");
  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);