lkml.org 
[lkml]   [2020]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/cpu] x86/cpu/bugs: Convert to new matching macros
    The following commit has been merged into the x86/cpu branch of tip:

    Commit-ID: f6d502fcfc51ae025f18a8de8f1ed2ab34503742
    Gitweb: https://git.kernel.org/tip/f6d502fcfc51ae025f18a8de8f1ed2ab34503742
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Fri, 20 Mar 2020 14:13:48 +01:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Tue, 24 Mar 2020 21:22:23 +01:00

    x86/cpu/bugs: Convert to new matching macros

    The new macro set has a consistent namespace and uses C99 initializers
    instead of the grufty C89 ones.

    The local wrappers have to stay as they are tailored to tame the hardware
    vulnerability mess.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Link: https://lkml.kernel.org/r/20200320131508.934926587@linutronix.de
    ---
    arch/x86/kernel/cpu/common.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 52c9bfb..f4c672e 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -1008,8 +1008,8 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
    #define NO_ITLB_MULTIHIT BIT(7)
    #define NO_SPECTRE_V2 BIT(8)

    -#define VULNWL(_vendor, _family, _model, _whitelist) \
    - { X86_VENDOR_##_vendor, _family, _model, X86_FEATURE_ANY, _whitelist }
    +#define VULNWL(vendor, family, model, whitelist) \
    + X86_MATCH_VENDOR_FAM_MODEL(vendor, family, model, whitelist)

    #define VULNWL_INTEL(model, whitelist) \
    VULNWL(INTEL, 6, INTEL_FAM6_##model, whitelist)
    \
     
     \ /
      Last update: 2020-03-24 23:33    [W:4.199 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site