diff options
| author | Tony Luck <tony.luck@intel.com> | 2024-04-24 11:15:16 -0700 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2024-04-26 09:02:26 -0700 |
| commit | 7cd2e9a9029929018857801455f48354192f2b08 (patch) | |
| tree | 02eb74af5f55191d0f5333ce8ad6f2644897acf4 | |
| parent | 343ec8beae3088478b5b742971dd1d4939223eff (diff) | |
| download | tip-7cd2e9a9029929018857801455f48354192f2b08.tar.gz | |
x86/cpu: Switch to new Intel CPU model defines
Notice: this object is not reachable from any branch.
New CPU #defines encode vendor and family as well as model.
[ dhansen: vertically align macro and remove stray subject / ]
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20240424181516.41887-1-tony.luck%40intel.com
Notice: this object is not reachable from any branch.
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index a58109583c4765..0c35207320cb4f 100644 --- 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 */ {} }; |