diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /arch/i386/kernel/time.c | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 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) | |||
| 412 | write_seqlock_irqsave(&xtime_lock, flags); | 412 | write_seqlock_irqsave(&xtime_lock, flags); |
| 413 | xtime.tv_sec = sec; | 413 | xtime.tv_sec = sec; |
| 414 | xtime.tv_nsec = 0; | 414 | xtime.tv_nsec = 0; |
| 415 | write_sequnlock_irqrestore(&xtime_lock, flags); | 415 | jiffies_64 += sleep_length; |
| 416 | jiffies += sleep_length; | ||
| 417 | wall_jiffies += sleep_length; | 416 | wall_jiffies += sleep_length; |
| 417 | write_sequnlock_irqrestore(&xtime_lock, flags); | ||
| 418 | if (last_timer->resume) | 418 | if (last_timer->resume) |
| 419 | last_timer->resume(); | 419 | last_timer->resume(); |
| 420 | cur_timer = last_timer; | 420 | cur_timer = last_timer; |