From e9637286736752ab53d993c9cb1a8bbac2952dbc Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 11 Sep 2009 11:59:22 +0200 Subject: [PATCH] --- yaml --- r: 162991 b: refs/heads/master c: e6b1b2c9c0461c4e0971ed905ce3cda6512ee82a h: refs/heads/master i: 162989: 602e5c467b1cf5720341fe70af0807406057c848 162987: 63505605f4af8aa913fc425d1c7b01154a2294c5 162983: a1a5a236a131601dffffdfb9340be95e28f50bef 162975: 4ca5754588088e91813bdc522e65769db241f3bf v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 7 ++++--- trunk/kernel/sched_features.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b4b27ab3752..9b36af9cbbe0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b78bb868c54bebbf8d8786a3f8320700d6d2b864 +refs/heads/master: e6b1b2c9c0461c4e0971ed905ce3cda6512ee82a diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index aa7f84121016..cea5b82242ee 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1526,9 +1526,10 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync) if (!sched_feat(WAKEUP_PREEMPT)) return; - if (sched_feat(WAKEUP_OVERLAP) && (sync || - (se->avg_overlap < sysctl_sched_migration_cost && - pse->avg_overlap < sysctl_sched_migration_cost))) { + if ((sched_feat(WAKEUP_SYNC) && sync) || + (sched_feat(WAKEUP_OVERLAP) && + (se->avg_overlap < sysctl_sched_migration_cost && + pse->avg_overlap < sysctl_sched_migration_cost))) { resched_task(curr); return; } diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h index e2dc63a5815d..07c8250b404c 100644 --- a/trunk/kernel/sched_features.h +++ b/trunk/kernel/sched_features.h @@ -12,6 +12,7 @@ SCHED_FEAT(ASYM_GRAN, 1) SCHED_FEAT(LB_BIAS, 1) SCHED_FEAT(LB_WAKEUP_UPDATE, 1) SCHED_FEAT(ASYM_EFF_LOAD, 1) +SCHED_FEAT(WAKEUP_SYNC, 0) SCHED_FEAT(WAKEUP_OVERLAP, 0) SCHED_FEAT(LAST_BUDDY, 1) SCHED_FEAT(OWNER_SPIN, 1)