The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 6fd5e8855e60a94f6f4b78a1314afac56fce7427 Gitweb: https://git.kernel.org/tip/6fd5e8855e60a94f6f4b78a1314afac56fce7427 Author: Tony Luck <tony.luck@xxxxxxxxx> AuthorDate: Mon, 20 May 2024 15:46:05 -07:00 Committer: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> CommitterDate: Tue, 28 May 2024 10:59:03 -07:00 x86/boot: Switch to new Intel CPU model defines New CPU #defines encode vendor and family as well as model but boot code doesn't have all the infrastructure to use them. Hard code the one CPU model number used here. Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx> Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/all/20240520224620.9480-35-tony.luck%40intel.com --- arch/x86/boot/cpucheck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index fed8d13..0aae4d4 100644 --- a/arch/x86/boot/cpucheck.c +++ b/arch/x86/boot/cpucheck.c @@ -203,7 +203,7 @@ int check_knl_erratum(void) */ if (!is_intel() || cpu.family != 6 || - cpu.model != INTEL_FAM6_XEON_PHI_KNL) + cpu.model != 0x57 /*INTEL_XEON_PHI_KNL*/) return 0; /*
|