The patch titled
Fix faulty HPET clocksource usage (fix for bug #7062)
has been added to the -mm tree. Its filename is
fix-faulty-hpet-clocksource-usage-fix-for-bug-7062.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix faulty HPET clocksource usage (fix for bug #7062)
From: john stultz <johnstul@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/hpet.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/i386/kernel/hpet.c~fix-faulty-hpet-clocksource-usage-fix-for-bug-7062 arch/i386/kernel/hpet.c
--- a/arch/i386/kernel/hpet.c~fix-faulty-hpet-clocksource-usage-fix-for-bug-7062
+++ a/arch/i386/kernel/hpet.c
@@ -35,7 +35,7 @@ static int __init init_hpet_clocksource(
void __iomem* hpet_base;
u64 tmp;
- if (!hpet_address)
+ if (!is_hpet_enabled())
return -ENODEV;
/* calculate the hpet address: */
_
Patches currently in -mm which might be from johnstul@xxxxxxxxxx are
fix-faulty-hpet-clocksource-usage-fix-for-bug-7062.patch
avr32-switch-to-generic-timekeeping-framework.patch
i386-kill-references-to-xtime.patch
i386-detect-clock-skew-during-suspend.patch
simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch
ntp-move-all-the-ntp-related-code-to-ntpc.patch
ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
ntp-add-ntp_update_frequency.patch
ntp-add-time_adj-to-tick-length.patch
ntp-add-time_freq-to-tick-length.patch
ntp-prescale-time_offset.patch
ntp-add-time_adjust-to-tick-length.patch
ntp-remove-time_tolerance.patch
ntp-convert-time_freq-to-nsec-value.patch
ntp-convert-to-the-ntp4-reference-model.patch
ntp-cleanup-defines-and-comments.patch
kernel-time-ntpc-possible-cleanups.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
