diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:53:56 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:53:56 -0600 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/i386/kernel/time.c | |
| parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/kernel/time.c')
| -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 a14d594bfbe..9d307475985 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; |