diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 08:25:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 08:25:06 -0800 |
| commit | 6c6f1f0f4db31a192916eaa31ec2f114fda7d5e5 (patch) | |
| tree | 565a79aa9db8332b6dd592ca241690e46dbc0225 /kernel/sched.c | |
| parent | 94dba895333a4321f27360e42b807260ae36bda4 (diff) | |
| parent | fc631c82e1734d718ff0832558f64c8f5d185f26 (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: revert recent sync wakeup changes
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index e72485033c4..c1d0ed36008 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2266,16 +2266,6 @@ 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; |