Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8ee291f87c5dcebcf9c3a0ee4e021586897db364
Commit:     8ee291f87c5dcebcf9c3a0ee4e021586897db364
Parent:     d43a3312c77eb6bbf71fbadefb1683f6d197bf91
Author:     Bernhard Walle <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 15 16:44:38 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Tue Jan 15 16:44:38 2008 +0100

    x86: fix RTC_AIE with CONFIG_HPET_EMULATE_RTC
    
    In the current code, RTC_AIE doesn't work if the RTC relies on
    CONFIG_HPET_EMULATE_RTC because the code sets the RTC_AIE flag in
    hpet_set_rtc_irq_bit().  The interrupt handles does accidentally check
    for RTC_PIE and not RTC_AIE when comparing the time which was set in
    hpet_set_alarm_time().
    
    I now verified on a test system here that without the patch applied,
    the attached test program fails on a system that has HPET with
    2.6.24-rc7-default. That's not critical since I guess the problem has
    been there for several kernel releases, but as the fix is quite
    obvious.
    
    Configuration is CONFIG_RTC=y and CONFIG_HPET_EMULATE_RTC=y.
    
    Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>
    Acked-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 arch/x86/kernel/hpet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 4a86ffd..2f99ee2 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -657,7 +657,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
                hpet_pie_count = 0;
        }
 
-       if (hpet_rtc_flags & RTC_PIE &&
+       if (hpet_rtc_flags & RTC_AIE &&
            (curr_time.tm_sec == hpet_alarm_time.tm_sec) &&
            (curr_time.tm_min == hpet_alarm_time.tm_min) &&
            (curr_time.tm_hour == hpet_alarm_time.tm_hour))
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to