x86/cpu: Switch to new Intel CPU model defines

aegl · bp3tk0v · commit c73cd3722103 · 2024-04-29T10:31:19.000+02:00
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/20240424181511.41753-1-tony.luck%40intel.com
diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c
@@ -25,7 +25,7 @@
  * asm/cpu_device_id.h contains a set of useful macros which are shortcuts
  * for various common selections. The above can be shortened to:
  *
- * X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, NULL);
+ * X86_MATCH_VFM(INTEL_BROADWELL, NULL);
  *
  * Arrays used to match for this should also be declared using
  * MODULE_DEVICE_TABLE(x86cpu, ...)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`* asm/cpu_device_id.h contains a set of useful macros which are shortcuts`
`26`	`26`	`* for various common selections. The above can be shortened to:`
`27`	`27`	`*`
`28`		`- * X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, NULL);`
	`28`	`+ * X86_MATCH_VFM(INTEL_BROADWELL, NULL);`
`29`	`29`	`*`
`30`	`30`	`* Arrays used to match for this should also be declared using`
`31`	`31`	`* MODULE_DEVICE_TABLE(x86cpu, ...)`