The following commit has been merged into the x86/cpu branch of tip: Commit-ID: d8422f6bb052b44db923a28afd8ceaef63d38d26 Gitweb: https://git.kernel.org/tip/d8422f6bb052b44db923a28afd8ceaef63d38d26 Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Tue, 05 May 2020 19:25:08 +02:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Thu, 07 May 2020 13:48:05 +02:00 x86/cpu: Add a X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS() macro ... to match Intel family 6 CPUs with steppings. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Reviewed-by: Mark Gross <mgross@xxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200506071516.25445-3-bp@xxxxxxxxx --- arch/x86/include/asm/cpu_device_id.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h index 10426cd..eb8fced 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h @@ -160,6 +160,10 @@ #define X86_MATCH_INTEL_FAM6_MODEL(model, data) \ X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data) +#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data) \ + X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model, \ + steppings, X86_FEATURE_ANY, data) + /* * Match specific microcode revisions. *
|