x86/cpu: Switch to new Intel CPU model defines

New CPU #defines encode vendor and family as well as model.

[ dhansen: vertically align macro and remove stray subject / ]

Signed-off-by: Tony Luck <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Link: https://lore.kernel.org/all/20240424181516.41887-1-tony.luck%40intel.com

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a58109583c476515a96156077b7181a3a20153d9..0c35207320cb4f6ded65d8ef64dbb24c63c1c84b 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -438,9 +438,9 @@ static bool match_pkg(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
  */
 
 static const struct x86_cpu_id intel_cod_cpu[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, 0),       /* COD */
-       X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, 0),     /* COD */
-       X86_MATCH_INTEL_FAM6_MODEL(ANY, 1),             /* SNC */
+       X86_MATCH_VFM(INTEL_HASWELL_X,   0),    /* COD */
+       X86_MATCH_VFM(INTEL_BROADWELL_X, 0),    /* COD */
+       X86_MATCH_VFM(INTEL_ANY,         1),    /* SNC */
        {}
 };