diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
tree | 7064703c5d63d44700085cd701703457730bc06e /kernel/sched.c | |
parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 52bbf1c842a..242d0d47a70 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2266,6 +2266,16 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync) if (!sched_feat(SYNC_WAKEUPS)) sync = 0; + if (!sync) { + if (current->se.avg_overlap < sysctl_sched_migration_cost && + p->se.avg_overlap < sysctl_sched_migration_cost) + sync = 1; + } else { + if (current->se.avg_overlap >= sysctl_sched_migration_cost || + p->se.avg_overlap >= sysctl_sched_migration_cost) + sync = 0; + } + #ifdef CONFIG_SMP if (sched_feat(LB_WAKEUP_UPDATE)) { struct sched_domain *sd; |