diff --git a/[refs] b/[refs] index 5307a6bd7e55..9bbae18d3e94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1af5f730fc1bf7c62ec9fb2d307206e18bf40a69 +refs/heads/master: 0d13033bc9257fe65c1aa25e84568b1608da0901 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index b27ccc52f6aa..b71ee2c62297 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1123,10 +1123,9 @@ wake_affine(struct sched_domain *this_sd, struct rq *this_rq, if (!(this_sd->flags & SD_WAKE_AFFINE) || !sched_feat(AFFINE_WAKEUPS)) return 0; - if (!sync && sched_feat(SYNC_WAKEUPS) && - curr->se.avg_overlap < sysctl_sched_migration_cost && - p->se.avg_overlap < sysctl_sched_migration_cost) - sync = 1; + if (sync && (curr->se.avg_overlap > sysctl_sched_migration_cost || + p->se.avg_overlap > sysctl_sched_migration_cost)) + sync = 0; /* * If sync wakeup then subtract the (maximum possible)