diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 11:49:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 11:49:52 -0500 |
| commit | 341031caec0cd730e84d248d95851bf54ec4e41f (patch) | |
| tree | f9531f3bef8446e0eb2f9f4ba1ed6fa1000585c8 /kernel/sched_fair.c | |
| parent | 836f48c5f8c6ef004419f1605514aa05eb58eefb (diff) | |
| parent | 6d558c3ac9b6508d26fd5cadccce51fc9d726b1c (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: Reassign prev and switch_count when reacquire_kernel_lock() fail
sched: Fix vmark regression on big machines
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 42ac3c9f66f..8fe7ee81c55 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -1508,7 +1508,7 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag | |||
| 1508 | * If there's an idle sibling in this domain, make that | 1508 | * If there's an idle sibling in this domain, make that |
| 1509 | * the wake_affine target instead of the current cpu. | 1509 | * the wake_affine target instead of the current cpu. |
| 1510 | */ | 1510 | */ |
| 1511 | if (tmp->flags & SD_PREFER_SIBLING) | 1511 | if (tmp->flags & SD_SHARE_PKG_RESOURCES) |
| 1512 | target = select_idle_sibling(p, tmp, target); | 1512 | target = select_idle_sibling(p, tmp, target); |
| 1513 | 1513 | ||
| 1514 | if (target >= 0) { | 1514 | if (target >= 0) { |