Commit b27b8efd authored by Li Shaohua's avatar Li Shaohua Committed by Linus Torvalds

[PATCH] preserve irqs in time_resume()

Unconditionally enabling interrupts is upsetting the ACPI time resume code.
Signed-off-by: default avatarLi Shaohua <shaohua.li@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 75d8c817
...@@ -333,11 +333,12 @@ static int time_suspend(struct sys_device *dev, u32 state) ...@@ -333,11 +333,12 @@ static int time_suspend(struct sys_device *dev, u32 state)
static int time_resume(struct sys_device *dev) static int time_resume(struct sys_device *dev)
{ {
unsigned long flags;
unsigned long sec = get_cmos_time() + clock_cmos_diff; unsigned long sec = get_cmos_time() + clock_cmos_diff;
write_seqlock_irq(&xtime_lock); write_seqlock_irqsave(&xtime_lock, flags);
xtime.tv_sec = sec; xtime.tv_sec = sec;
xtime.tv_nsec = 0; xtime.tv_nsec = 0;
write_sequnlock_irq(&xtime_lock); write_sequnlock_irqrestore(&xtime_lock, flags);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment