The patch titled
     time: fix hpet wrong values
has been added to the -mm tree.  Its filename is
     fix-hpet-wrong-values.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: time: fix hpet wrong values
From: Pavel Machek <[EMAIL PROTECTED]>

If hpet is not enabled in config, its init should not pretend to work,
and people should not try to get time from it.

Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Cc: Thomas Gleixner <[EMAIL PROTECTED]>
Cc: Ingo Molnar <[EMAIL PROTECTED]>
Cc: john stultz <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/asm-x86/hpet.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN include/asm-x86/hpet.h~fix-hpet-wrong-values include/asm-x86/hpet.h
--- a/include/asm-x86/hpet.h~fix-hpet-wrong-values
+++ a/include/asm-x86/hpet.h
@@ -81,8 +81,8 @@ extern irqreturn_t hpet_rtc_interrupt(in
 
 #else
 
-static inline int hpet_enable(void) { return 0; }
-static inline unsigned long hpet_readl(unsigned long a) { return 0; }
+static inline int hpet_enable(void) { return -ENODEV; }
+static inline unsigned long hpet_readl(unsigned long a) { BUG(); }
 
 #endif /* CONFIG_HPET_TIMER */
 #endif /* ASM_X86_HPET_H */
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

git-acpi.patch
working-3d-dri-intel-agpko-resume-for-i815-chip.patch
clean-hungarian-notation-from-timers.patch
timer-cleanups.patch
more-timer-related-cleanups.patch
fix-hpet-wrong-values.patch
fix-config_mtd_sharp_sl-if-config_mtd=m-try2.patch
fix-proc-net-breakage.patch
kernel-power-diskc-make-code-static.patch
make-kernel_shutdown_prepare-static.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to