x86: use cpu_khz for loops_per_jiffy calculation, cleanup

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / time_64.c

diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index 12b4a71bd0748555cac1d552fe96cc8d8e2c19c3..39ae8511a1376f1681989687d3d4e2c84e843c24 100644 (file)
--- a/arch/x86/kernel/time_64.c
+++ b/arch/x86/kernel/time_64.c
@@ -123,7 +123,7 @@ void __init time_init(void)
                (boot_cpu_data.x86_vendor == X86_VENDOR_AMD))
                cpu_khz = calculate_cpu_khz();
 
-       lpj_tsc = ((unsigned long)tsc_khz * 1000)/HZ;
+       lpj_fine = ((unsigned long)tsc_khz * 1000)/HZ;
 
        if (unsynchronized_tsc())
                mark_tsc_unstable("TSCs unsynchronized");