Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] get_cmos_time() locking fix (lockdep)

Browse source 
rtc_lock is supposed to be irq-safe.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton 2006-07-10 04:44:59 -07:00 committed by Linus Torvalds
parent 11eebe307e
commit 7ba1c6c88c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/i386/kernel/time.c
View file

@ -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 get_cmos_time(void)
{ {
unsigned long retval; unsigned long retval;
unsigned long flags;
spin_lock(&rtc_lock); spin_lock_irqsave(&rtc_lock, flags);
if (efi_enabled) if (efi_enabled)
retval = efi_get_time(); retval = efi_get_time();
else else
retval = mach_get_cmos_time(); retval = mach_get_cmos_time();
spin_unlock(&rtc_lock); spin_unlock_irqrestore(&rtc_lock, flags);
return retval; return retval;
} }