diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:03:56 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:03:56 -0400 |
| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 (patch) | |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 /kernel/time/tick-sched.c | |
| parent | 5217192b85480353aeeb395574e60d0db04f3676 (diff) | |
| parent | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 (diff) | |
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 4b1785a7bb83..cf5f6b262673 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -574,6 +574,7 @@ static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) | |||
| 574 | tick_do_update_jiffies64(now); | 574 | tick_do_update_jiffies64(now); |
| 575 | update_cpu_load_nohz(); | 575 | update_cpu_load_nohz(); |
| 576 | 576 | ||
| 577 | calc_load_exit_idle(); | ||
| 577 | touch_softlockup_watchdog(); | 578 | touch_softlockup_watchdog(); |
| 578 | /* | 579 | /* |
| 579 | * Cancel the scheduled timer and restore the tick | 580 | * Cancel the scheduled timer and restore the tick |