diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-04-25 08:59:16 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-04-25 08:59:16 +0200 |
commit | 3dbe927b1eddcbd66da1653168e33122aca84f4e (patch) | |
tree | 2357f4c55156597b1d07b9ea360b07086cd011e4 /kernel/time/tick-sched.c | |
parent | Merge tag 'v3.4-rc2' into perf/core (diff) | |
parent | Linux 3.4-rc4 (diff) | |
download | linux-dev-3dbe927b1eddcbd66da1653168e33122aca84f4e.tar.xz linux-dev-3dbe927b1eddcbd66da1653168e33122aca84f4e.zip |
Merge tag 'v3.4-rc4' into perf/core
Merge v3.4-rc4 - we were on -rc2 before.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/tick-sched.c')
-rw-r--r-- | kernel/time/tick-sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 3526038f2836..6a3a5b9ff561 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -534,9 +534,9 @@ static void tick_nohz_restart(struct tick_sched *ts, ktime_t now) hrtimer_get_expires(&ts->sched_timer), 0)) break; } - /* Update jiffies and reread time */ - tick_do_update_jiffies64(now); + /* Reread time and update jiffies */ now = ktime_get(); + tick_do_update_jiffies64(now); } } |