Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / x86 / kernel / cpu / microcode / core.c

diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index b3e94ef..faec712 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -129,8 +129,8 @@ void __init load_ucode_bsp(void)
        if (!have_cpuid_p())
                return;
 
-       vendor = x86_vendor();
-       family = x86_family();
+       vendor = x86_cpuid_vendor();
+       family = x86_cpuid_family();
 
        switch (vendor) {
        case X86_VENDOR_INTEL:
@@ -165,8 +165,8 @@ void load_ucode_ap(void)
        if (!have_cpuid_p())
                return;
 
-       vendor = x86_vendor();
-       family = x86_family();
+       vendor = x86_cpuid_vendor();
+       family = x86_cpuid_family();
 
        switch (vendor) {
        case X86_VENDOR_INTEL:
@@ -206,8 +206,8 @@ void reload_early_microcode(void)
 {
        int vendor, family;
 
-       vendor = x86_vendor();
-       family = x86_family();
+       vendor = x86_cpuid_vendor();
+       family = x86_cpuid_family();
 
        switch (vendor) {
        case X86_VENDOR_INTEL: