leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/microcode: Remove local vendor variable

Browse Source 
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>
This commit is contained in:
Borislav Petkov 2017-01-20 21:29:50 +01:00 committed by Thomas Gleixner
parent 8cc26e0b4c
commit 7a93a40be2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/cpu/microcode/core.c
View File

@ -122,15 +122,14 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)
void __init load_ucode_bsp(void) void __init load_ucode_bsp(void)
{ {
unsigned int vendor, cpuid_1_eax; unsigned int cpuid_1_eax;
if (check_loader_disabled_bsp()) if (check_loader_disabled_bsp())
return; return;
vendor = x86_cpuid_vendor();
cpuid_1_eax = native_cpuid_eax(1); cpuid_1_eax = native_cpuid_eax(1);
switch (vendor) { switch (x86_cpuid_vendor()) {
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
if (x86_family(cpuid_1_eax) >= 6) if (x86_family(cpuid_1_eax) >= 6)
load_ucode_intel_bsp(); load_ucode_intel_bsp();
@ -155,15 +154,14 @@ static bool check_loader_disabled_ap(void)
void load_ucode_ap(void) void load_ucode_ap(void)
{ {
unsigned int vendor, cpuid_1_eax; unsigned int cpuid_1_eax;
if (check_loader_disabled_ap()) if (check_loader_disabled_ap())
return; return;
vendor = x86_cpuid_vendor();
cpuid_1_eax = native_cpuid_eax(1); cpuid_1_eax = native_cpuid_eax(1);
switch (vendor) { switch (x86_cpuid_vendor()) {
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
if (x86_family(cpuid_1_eax) >= 6) if (x86_family(cpuid_1_eax) >= 6)
load_ucode_intel_ap(); load_ucode_intel_ap();