diff options
author | Andreas Herrmann3 <andreas.herrmann3@amd.com> | 2008-01-30 13:33:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:35 +0100 |
commit | 519efbc0b3b6004a3b98d66a446bce30852c8171 (patch) | |
tree | 98cf48fb98c5dfe799a0d67960ac7a5c4ff85c05 | |
parent | cd7d72bb27a8c7502a602bdc299f1bb0a9357975 (diff) | |
download | op-kernel-dev-519efbc0b3b6004a3b98d66a446bce30852c8171.zip op-kernel-dev-519efbc0b3b6004a3b98d66a446bce30852c8171.tar.gz |
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 <andreas.herrmann3@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/time_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c index 61b17f5..0380795 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()) |