[PATCH] get_cmos_time() locking fix (lockdep)

rtc_lock is supposed to be irq-safe.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 316421a7f56f..8705c0f05788 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -206,15 +206,16 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 unsigned long get_cmos_time(void)
 {
         unsigned long retval;
+        unsigned long flags;
 
-        spin_lock(&rtc_lock);
+        spin_lock_irqsave(&rtc_lock, flags);
 
         if (efi_enabled)
                 retval = efi_get_time();
         else
                 retval = mach_get_cmos_time();
 
-        spin_unlock(&rtc_lock);
+        spin_unlock_irqrestore(&rtc_lock, flags);
 
         return retval;
 }