| commit | fd4954714e8e7db9f6eb5878fa6111c46445ca81 | |
| author | john stultz <johnstul@us.ibm.com> | |
| Tue, 13 Dec 2005 06:17:13 +0000 (12 22:17 -0800) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Tue, 13 Dec 2005 06:31:16 +0000 (12 22:31 -0800) | ||
| tree | 189264d0e9ae74930a3118f3a480ffff233a742a | treesnapshot (tar.gz zip) |
| parent | df818a52fb5e64c72b21029fb9ba80583106932c | commitdiff |
[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>
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>
| arch/x86_64/kernel/time.c | diffblobblamehistory |