Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299078
b: refs/heads/master
c: 6f10392
h: refs/heads/master
v: v3
  • Loading branch information
Neal Cardwell authored and Thomas Gleixner committed Apr 6, 2012
1 parent b7f660d commit 69f15b8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3872c48b14259d8c0a00c9fff06a4a4123f7f4eb
refs/heads/master: 6f103929f8979d2638e58d7f7fda0beefcb8ee7e
4 changes: 2 additions & 2 deletions trunk/kernel/time/tick-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 69f15b8

Please sign in to comment.