lkml.org 
[lkml]   [2017]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/mce] x86/microcode: Remove local vendor variable
    Commit-ID:  7a93a40be23e5557934d773cc89b7b3627c08097
    Gitweb: http://git.kernel.org/tip/7a93a40be23e5557934d773cc89b7b3627c08097
    Author: Borislav Petkov <bp@suse.de>
    AuthorDate: Fri, 20 Jan 2017 21:29:50 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Mon, 23 Jan 2017 10:02:49 +0100

    x86/microcode: Remove local vendor variable

    Use x86_cpuid_vendor() directly.

    No functionality change.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: http://lkml.kernel.org/r/20170120202955.4091-12-bp@alien8.de
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

    ---
    arch/x86/kernel/cpu/microcode/core.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
    index 437996c..dc54518 100644
    --- a/arch/x86/kernel/cpu/microcode/core.c
    +++ b/arch/x86/kernel/cpu/microcode/core.c
    @@ -122,15 +122,14 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)

    void __init load_ucode_bsp(void)
    {
    - unsigned int vendor, cpuid_1_eax;
    + unsigned int cpuid_1_eax;

    if (check_loader_disabled_bsp())
    return;

    - vendor = x86_cpuid_vendor();
    cpuid_1_eax = native_cpuid_eax(1);

    - switch (vendor) {
    + switch (x86_cpuid_vendor()) {
    case X86_VENDOR_INTEL:
    if (x86_family(cpuid_1_eax) >= 6)
    load_ucode_intel_bsp();
    @@ -155,15 +154,14 @@ static bool check_loader_disabled_ap(void)

    void load_ucode_ap(void)
    {
    - unsigned int vendor, cpuid_1_eax;
    + unsigned int cpuid_1_eax;

    if (check_loader_disabled_ap())
    return;

    - vendor = x86_cpuid_vendor();
    cpuid_1_eax = native_cpuid_eax(1);

    - switch (vendor) {
    + switch (x86_cpuid_vendor()) {
    case X86_VENDOR_INTEL:
    if (x86_family(cpuid_1_eax) >= 6)
    load_ucode_intel_ap();
    \
     
     \ /
      Last update: 2017-01-23 10:13    [W:4.138 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site