diff options
| author | john stultz <johnstul@us.ibm.com> | 2006-09-01 00:27:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:39:08 -0400 |
| commit | 30f3174d1c506db2c6d2c1dddc9c064e741d6b76 (patch) | |
| tree | 3b29c5f68c06604522db63b70c374fe1c31eafb1 /arch | |
| parent | 202af6d50155f8594ba01d8e0a54d77facc0152a (diff) | |
[PATCH] Fix faulty HPET clocksource usage (fix for bug #7062)
Apparently some systems export valid HPET addresses, but hpet_enable()
fails. Then when the HPET clocksource starts up, it only checks for a
valid HPET address, and the result is a system where time does not advance.
See http://bugme.osdl.org/show_bug.cgi?id=7062 for details.
This patch just makes sure we better check that the HPET is functional
before registering the HPET clocksource.
Signed-off-by: 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')
| -rw-r--r-- | arch/i386/kernel/hpet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index c6737c35815d..17647a530b2f 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c | |||
| @@ -35,7 +35,7 @@ static int __init init_hpet_clocksource(void) | |||
| 35 | void __iomem* hpet_base; | 35 | void __iomem* hpet_base; |
| 36 | u64 tmp; | 36 | u64 tmp; |
| 37 | 37 | ||
| 38 | if (!hpet_address) | 38 | if (!is_hpet_enabled()) |
| 39 | return -ENODEV; | 39 | return -ENODEV; |
| 40 | 40 | ||
| 41 | /* calculate the hpet address: */ | 41 | /* calculate the hpet address: */ |