From 59cf409d49d1c6ee22a4732e694e13a060683116 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 13 May 2008 10:34:20 +0200 Subject: [PATCH] --- yaml --- r: 99525 b: refs/heads/master c: 0748aca6f0af917591dcfd70dccac770a25d4f71 h: refs/heads/master i: 99523: 8ba320568cb7e911a3c596d082fcae3129e0bb63 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc_32.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 45fbbf826b51..c5dbe1063b8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c4728f4a865067d96fb84f1d9c65e0ccd1f355d +refs/heads/master: 0748aca6f0af917591dcfd70dccac770a25d4f71 diff --git a/trunk/arch/x86/kernel/tsc_32.c b/trunk/arch/x86/kernel/tsc_32.c index e4790728b224..d53b1040cbb7 100644 --- a/trunk/arch/x86/kernel/tsc_32.c +++ b/trunk/arch/x86/kernel/tsc_32.c @@ -283,7 +283,6 @@ core_initcall(cpufreq_tsc); /* clock source code */ -static unsigned long current_tsc_khz; static struct clocksource clocksource_tsc; /* @@ -434,9 +433,8 @@ void __init tsc_init(void) unsynchronized_tsc(); check_geode_tsc_reliable(); - current_tsc_khz = tsc_khz; - clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, - clocksource_tsc.shift); + clocksource_tsc.mult = clocksource_khz2mult(tsc_khz, + clocksource_tsc.shift); /* lower the rating if we already know its unstable: */ if (check_tsc_unstable()) { clocksource_tsc.rating = 0;