x86/nmi_watchdog: Fix old-style NMI watchdog regression on old Intel CPUs

[linux-2.6-microblaze.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7ffb0cf..7770245 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1865,9 +1865,6 @@ static bool slv_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq)
        return true;
 }
 
-#include <asm/cpu_device_id.h>
-#include <asm/intel-family.h>
-
 #define X86_MATCH(model)                                       \
        X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6,            \
                INTEL_FAM6_##model, X86_FEATURE_APERFMPERF, NULL)
@@ -2046,7 +2043,7 @@ static bool amd_set_max_freq_ratio(void)
                return false;
        }
 
-       highest_perf = perf_caps.highest_perf;
+       highest_perf = amd_get_highest_perf();
        nominal_perf = perf_caps.nominal_perf;
 
        if (!highest_perf || !nominal_perf) {