aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/apic.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2007-05-02 13:27:06 -0400
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 13:27:06 -0400
commit6b37f5a20c0e5c334c010a587058354215433e92 (patch)
treede875cded9229b46f94a10aa2c1379060247280e /arch/x86_64/kernel/apic.c
parentfbc16f2c2a0e16dbd75ac85d3b6db97f92b642ba (diff)
[PATCH] x86-64: fix cpu MHz reporting on constant_tsc cpus
This patch fixes the reporting of cpu_mhz in /proc/cpuinfo on CPUs with a constant TSC rate and a kernel with disabled cpufreq. Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Andi Kleen <ak@suse.de> arch/x86_64/kernel/apic.c | 2 - arch/x86_64/kernel/time.c | 58 +++++++++++++++++++++++++++++++++++++++--- arch/x86_64/kernel/tsc.c | 12 +++++--- arch/x86_64/kernel/tsc_sync.c | 2 - include/asm-x86_64/proto.h | 1 5 files changed, 65 insertions(+), 10 deletions(-)
Diffstat (limited to 'arch/x86_64/kernel/apic.c')
-rw-r--r--arch/x86_64/kernel/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index bd3e45d47c37..3421f21b6c70 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -843,7 +843,7 @@ static int __init calibrate_APIC_clock(void)
843 } while ((tsc - tsc_start) < TICK_COUNT && 843 } while ((tsc - tsc_start) < TICK_COUNT &&
844 (apic - apic_start) < TICK_COUNT); 844 (apic - apic_start) < TICK_COUNT);
845 845
846 result = (apic_start - apic) * 1000L * cpu_khz / 846 result = (apic_start - apic) * 1000L * tsc_khz /
847 (tsc - tsc_start); 847 (tsc - tsc_start);
848 } 848 }
849 printk("result %d\n", result); 849 printk("result %d\n", result);