Messages in this thread Patch in this message | | | Date | Mon, 29 Apr 2024 09:01:54 -0000 | From | "tip-bot2 for Tony Luck" <> | Subject | [tip: x86/cpu] x86/cpu: Switch to new Intel CPU model defines |
| |
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: c73cd372210343b271159eab0bdc95820e5e7b86 Gitweb: https://git.kernel.org/tip/c73cd372210343b271159eab0bdc95820e5e7b86 Author: Tony Luck <tony.luck@intel.com> AuthorDate: Wed, 24 Apr 2024 11:15:11 -07:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Mon, 29 Apr 2024 10:31:19 +02:00
x86/cpu: 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/20240424181511.41753-1-tony.luck%40intel.com --- arch/x86/kernel/cpu/match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c index 2243083..8651643 100644 --- 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, ...)
| |