diff options
author | Andreas Herrmann3 <andreas.herrmann3@amd.com> | 2008-01-30 07:33:35 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:35 -0500 |
commit | 519efbc0b3b6004a3b98d66a446bce30852c8171 (patch) | |
tree | 98cf48fb98c5dfe799a0d67960ac7a5c4ff85c05 /arch/x86 | |
parent | cd7d72bb27a8c7502a602bdc299f1bb0a9357975 (diff) |
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>
Diffstat (limited to 'arch/x86')
-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 61b17f5ec867..0380795121a6 100644 --- a/arch/x86/kernel/time_64.c +++ b/arch/x86/kernel/time_64.c | |||
@@ -120,8 +120,7 @@ void __init time_init(void) | |||
120 | 120 | ||
121 | cpu_khz = tsc_khz; | 121 | cpu_khz = tsc_khz; |
122 | if (cpu_has(&boot_cpu_data, X86_FEATURE_CONSTANT_TSC) && | 122 | if (cpu_has(&boot_cpu_data, X86_FEATURE_CONSTANT_TSC) && |
123 | boot_cpu_data.x86_vendor == X86_VENDOR_AMD && | 123 | (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)) |
124 | boot_cpu_data.x86 == 16) | ||
125 | cpu_khz = calculate_cpu_khz(); | 124 | cpu_khz = calculate_cpu_khz(); |
126 | 125 | ||
127 | if (unsynchronized_tsc()) | 126 | if (unsynchronized_tsc()) |