projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11eebe3
)
[PATCH] get_cmos_time() locking fix (lockdep)
author
Andrew Morton
<akpm@osdl.org>
Mon, 10 Jul 2006 11:44:59 +0000
(
04:44
-0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 10 Jul 2006 20:24:22 +0000
(13:24 -0700)
rtc_lock is supposed to be irq-safe.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/time.c
patch
|
blob
|
history
diff --git
a/arch/i386/kernel/time.c
b/arch/i386/kernel/time.c
index
316421a
..
8705c0f
100644
(file)
--- 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;
}