The patch titled
rtc: lockdep fix/workaround
has been removed from the -mm tree. Its filename is
rtc-lockdep-fix-workaround.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: rtc: lockdep fix/workaround
From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted)
[<c04051ee>] show_trace_log_lvl+0x58/0x171
[<c0405802>] show_trace+0xd/0x10
[<c040591b>] dump_stack+0x19/0x1b
[<c043abee>] trace_hardirqs_on+0xa2/0x11e
[<c06143c3>] _spin_unlock_irq+0x22/0x26
[<c0541540>] rtc_get_rtc_time+0x32/0x176
[<c0419ba4>] hpet_rtc_interrupt+0x92/0x14d
[<c0450f94>] handle_IRQ_event+0x20/0x4d
[<c0451055>] __do_IRQ+0x94/0xef
[<c040678d>] do_IRQ+0x9e/0xbd
[<c0404a49>] common_interrupt+0x25/0x2c
DWARF2 unwinder stuck at common_interrupt+0x25/0x2c
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/rtc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/char/rtc.c~rtc-lockdep-fix-workaround drivers/char/rtc.c
--- a/drivers/char/rtc.c~rtc-lockdep-fix-workaround
+++ a/drivers/char/rtc.c
@@ -209,11 +209,12 @@ static const unsigned char days_in_mo[]
*/
static inline unsigned char rtc_is_updating(void)
{
+ unsigned long flags;
unsigned char uip;
- spin_lock_irq(&rtc_lock);
+ spin_lock_irqsave(&rtc_lock, flags);
uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
- spin_unlock_irq(&rtc_lock);
+ spin_unlock_irqrestore(&rtc_lock, flags);
return uip;
}
_
Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are
origin.patch
mm-tracking-shared-dirty-pages.patch
mm-balance-dirty-pages.patch
mm-optimize-the-new-mprotect-code-a-bit.patch
mm-small-cleanup-of-install_page.patch
mm-fixup-do_wp_page.patch
mm-msync-cleanup.patch
mm-swap-write-failure-fixup.patch
forcedeth-hardirq-lockdep-warning.patch
block_devc-mutex_lock_nested-fix.patch
remove-the-old-bd_mutex-lockdep-annotation.patch
new-bd_mutex-lockdep-annotation.patch
nfsd-lockdep-annotation.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
