From: Tony Luck <tony.luck@intel.com>
Date: Mon, 20 May 2024 22:46:09 +0000 (-0700)
Subject: EDAC/skx: Switch to new Intel CPU model defines
X-Git-Tag: v6.11-rc1~204^2^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2c887e9f967aab2b0ff94c25de64c5a97ef94fe;p=thirdparty%2Flinux.git

EDAC/skx: Switch to new Intel CPU model defines

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

Signed-off-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240520224620.9480-39-tony.luck@intel.com
---

diff --git a/drivers/edac/skx_base.c b/drivers/edac/skx_base.c
index 0a862336a7ce8..af3fa807acdba 100644
--- a/drivers/edac/skx_base.c
+++ b/drivers/edac/skx_base.c
@@ -164,7 +164,7 @@ static struct res_config skx_cfg = {
 };
 
 static const struct x86_cpu_id skx_cpuids[] = {
-	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg),
+	X86_MATCH_VFM_STEPPINGS(INTEL_SKYLAKE_X, X86_STEPPINGS(0x0, 0xf), &skx_cfg),
 	{ }
 };
 MODULE_DEVICE_TABLE(x86cpu, skx_cpuids);