Commit 4db64279 authored by Tony Luck's avatar Tony Luck Committed by Borislav Petkov (AMD)
Browse files

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: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/all/20240424181516.41887-1-tony.luck%40intel.com
parent db99675e

arch/x86/kernel/smpboot.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

	{}

};