Skip to content

Commit d9b6886

Browse files
aeglbp3tk0v
authored andcommitted
x86/tsc_msr: 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> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/all/20240424181518.41927-1-tony.luck%40intel.com
1 parent f21b075 commit d9b6886

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

arch/x86/kernel/tsc_msr.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ static const struct freq_desc freq_desc_lgm = {
147147
};
148148

149149
static const struct x86_cpu_id tsc_msr_cpu_ids[] = {
150-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, &freq_desc_pnw),
151-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_TABLET,&freq_desc_clv),
152-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &freq_desc_byt),
153-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &freq_desc_tng),
154-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &freq_desc_cht),
155-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT_MID, &freq_desc_ann),
156-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT_NP, &freq_desc_lgm),
150+
X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, &freq_desc_pnw),
151+
X86_MATCH_VFM(INTEL_ATOM_SALTWELL_TABLET, &freq_desc_clv),
152+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT, &freq_desc_byt),
153+
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, &freq_desc_tng),
154+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT, &freq_desc_cht),
155+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT_MID, &freq_desc_ann),
156+
X86_MATCH_VFM(INTEL_ATOM_AIRMONT_NP, &freq_desc_lgm),
157157
{}
158158
};
159159

0 commit comments

Comments
 (0)