From: Andreas Herrmann3 Date: Wed, 30 Jan 2008 12:33:35 +0000 (+0100) Subject: x86: fix cpu MHz reporting for AMD family 0x11 X-Git-Tag: v2.6.25-rc1~1143^2~180 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=519efbc0b3b6004a3b98d66a446bce30852c8171;p=linux-2.6-omap-h63xx.git x86: fix cpu MHz reporting for AMD family 0x11 Fix cpu MHz reporting for AMD family 0x11 when powernow-k8 is disabled. Just adhere to the CONSTANT_TSC feature bit for AMD CPUs when deciding whether cpu_khz needs calibration. The additional check for CPU family is not needed and prevents calibration for future CPUs. Signed-off-by: Andreas Herrmann Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c index 61b17f5ec86..0380795121a 100644 --- a/arch/x86/kernel/time_64.c +++ b/arch/x86/kernel/time_64.c @@ -120,8 +120,7 @@ void __init time_init(void) cpu_khz = tsc_khz; if (cpu_has(&boot_cpu_data, X86_FEATURE_CONSTANT_TSC) && - boot_cpu_data.x86_vendor == X86_VENDOR_AMD && - boot_cpu_data.x86 == 16) + (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)) cpu_khz = calculate_cpu_khz(); if (unsynchronized_tsc())