Commit fd495471 authored Dec 12, 2005 by John Stultz Committed by Linus Torvalds Dec 12, 2005

[PATCH] x86_64: Fix collision between pmtimer and pit/hpet



On systems that do not support the HPET legacy functions (basically the IBM
x460, but there could be others), in time_init() we accidentally fall into a
PM timer conditional and set the vxtime_hz value to the PM timer's frequency.
We then use this value with the HPET for timekeeping.

This patch (which mimics the behavior in time_init_gtod) corrects the
collision.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent df818a52

arch/x86_64/kernel/time.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -915,7 +915,7 @@ void __init time_init(void)
		cpu_khz = hpet_calibrate_tsc();
		timename = "HPET";
		#ifdef CONFIG_X86_PM_TIMER
		} else if (pmtmr_ioport) {
		} else if (pmtmr_ioport && !vxtime.hpet_address) {
		vxtime_hz = PM_TIMER_FREQUENCY;
		timename = "PM";
		pit_init();