summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorTim Mann <mann@vmware.com>2005-11-13 16:06:54 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 18:14:13 -0800
commit7feacd53347c04aee789ba5d632eda0c3fc421c4 (patch)
tree87050958ebdacb288dac2c1939e08149a0623b23 /arch/i386
parente27182088e607880713d9c286a3d92d861c280e4 (diff)
downloadlinux-3.10-7feacd53347c04aee789ba5d632eda0c3fc421c4.tar.gz
linux-3.10-7feacd53347c04aee789ba5d632eda0c3fc421c4.tar.bz2
linux-3.10-7feacd53347c04aee789ba5d632eda0c3fc421c4.zip
[PATCH] x86: fix cpu_khz with clock=pit
Fix http://bugzilla.kernel.org/show_bug.cgi?id=5546 The cpu_khz global is not initialized and remains 0 if you boot with clock=pit, even if the processor does have a TSC. This may have bad ramifications since the variable is used in various places scattered around the kernel, though I didn't check them all to see if they can tolerate cpu_khz = 0. You can observe the problem by doing "cat /proc/cpuinfo"; the cpu MHz line says 0.000. The fix is trivial; call init_cpu_khz() from init_pit(), just as it's called from the timers/timer_foo.c:init_foo() for other values of foo. Cc: john stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/timers/timer_pit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c
index e42e46d3515..b9b6bd56b9b 100644
--- a/arch/i386/kernel/timers/timer_pit.c
+++ b/arch/i386/kernel/timers/timer_pit.c
@@ -25,8 +25,9 @@ static int __init init_pit(char* override)
{
/* check clock override */
if (override[0] && strncmp(override,"pit",3))
- printk(KERN_ERR "Warning: clock= override failed. Defaulting to PIT\n");
-
+ printk(KERN_ERR "Warning: clock= override failed. Defaulting "
+ "to PIT\n");
+ init_cpu_khz();
count_p = LATCH;
return 0;
}