diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2006-03-06 15:42:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-06 18:40:44 -0800 |
| commit | f7c09bd972b7111b8c69bf57a189571edd4d4a7d (patch) | |
| tree | bc06c2cdf607746f8c9858b9771895a02f27a0b2 | |
| parent | b05121b29e8af45ccb424bf71dadc1d04bd23f03 (diff) | |
| download | blackbird-op-linux-f7c09bd972b7111b8c69bf57a189571edd4d4a7d.tar.gz blackbird-op-linux-f7c09bd972b7111b8c69bf57a189571edd4d4a7d.zip | |
[PATCH] x86: fix potential jiffies overflow in timer_resume()
i386 timer_resume is updating jiffies, not jiffies_64. It looks there is a
potential overflow problem. And jiffies_64 and wall_jiffies should be
protected by xtime_lock.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index a14d594bfbeb..9d3074759856 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -412,9 +412,9 @@ static int timer_resume(struct sys_device *dev) write_seqlock_irqsave(&xtime_lock, flags); xtime.tv_sec = sec; xtime.tv_nsec = 0; - write_sequnlock_irqrestore(&xtime_lock, flags); - jiffies += sleep_length; + jiffies_64 += sleep_length; wall_jiffies += sleep_length; + write_sequnlock_irqrestore(&xtime_lock, flags); if (last_timer->resume) last_timer->resume(); cur_timer = last_timer; |
