diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-23 09:44:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-23 09:44:48 -0700 |
| commit | ce0b78dbf16e78d6726fb24c71b70f617bc6048a (patch) | |
| tree | 5d98b3708af8daaba3ad30e919d7190c04aeb1a8 /kernel/sched/core.c | |
| parent | c2f18b4fd0441c6367a153efe1d24e9df3274934 (diff) | |
| parent | d71b1a76b1a797648ec6740f1a206e597d6b139a (diff) | |
Merge "sched/core_ctl: Fix state_lock spinlock contention"
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 312ffdad034a..1017a3f77391 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -88,6 +88,7 @@ #include "sched.h" #include "../workqueue_internal.h" #include "../smpboot.h" +#include "../time/tick-internal.h" #define CREATE_TRACE_POINTS #include <trace/events/sched.h> @@ -3260,7 +3261,8 @@ void scheduler_tick(void) if (curr->sched_class == &fair_sched_class) check_for_migration(rq, curr); - core_ctl_check(wallclock); + if (cpu == tick_do_timer_cpu) + core_ctl_check(wallclock); } #ifdef CONFIG_NO_HZ_FULL |