diff options
| author | john stultz <johnstul@us.ibm.com> | 2005-12-12 22:17:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 22:31:16 -0800 |
| commit | fd4954714e8e7db9f6eb5878fa6111c46445ca81 (patch) | |
| tree | 189264d0e9ae74930a3118f3a480ffff233a742a /arch | |
| parent | df818a52fb5e64c72b21029fb9ba80583106932c (diff) | |
| download | linux-fd4954714e8e7db9f6eb5878fa6111c46445ca81.tar.gz linux-fd4954714e8e7db9f6eb5878fa6111c46445ca81.tar.bz2 linux-fd4954714e8e7db9f6eb5878fa6111c46445ca81.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 4434e154f596..74102796e5c0 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -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(); |