Commit 0a6fd29e authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: don't corrupt interrupt flag on timer resume

Don't corrupt interrupt flag in time resume
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4504ba5a
......@@ -884,11 +884,12 @@ static int time_suspend(struct sys_device *dev, u32 state)
static int time_resume(struct sys_device *dev)
{
unsigned long flags;
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_nsec = 0;
write_sequnlock_irq(&xtime_lock);
write_sequnlock_irqrestore(&xtime_lock,flags);
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