summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:10:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:10:38 -0700
commit6e958d73c25eecaf02a1998cda9ec8ce8da11042 (patch)
tree94b8d48d268297925aa02f8ab358274f878bae9e /include
parent7811a32407b971d9086c46403124f1453b95c430 (diff)
parent92f6a5e37a2e2d3342dafb2b39c2f8bc340bbf84 (diff)
downloadop-kernel-dev-6e958d73c25eecaf02a1998cda9ec8ce8da11042.zip
op-kernel-dev-6e958d73c25eecaf02a1998cda9ec8ce8da11042.tar.gz
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: Do less agressive buddy clearing sched: Disable SD_PREFER_LOCAL for MC/CPU domains
Diffstat (limited to 'include')
-rw-r--r--include/linux/topology.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h
index fc0bf3e..57e6357 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -129,7 +129,7 @@ int arch_update_cpu_topology(void);
| 1*SD_BALANCE_FORK \
| 0*SD_BALANCE_WAKE \
| 1*SD_WAKE_AFFINE \
- | 1*SD_PREFER_LOCAL \
+ | 0*SD_PREFER_LOCAL \
| 0*SD_SHARE_CPUPOWER \
| 1*SD_SHARE_PKG_RESOURCES \
| 0*SD_SERIALIZE \
@@ -162,7 +162,7 @@ int arch_update_cpu_topology(void);
| 1*SD_BALANCE_FORK \
| 0*SD_BALANCE_WAKE \
| 1*SD_WAKE_AFFINE \
- | 1*SD_PREFER_LOCAL \
+ | 0*SD_PREFER_LOCAL \
| 0*SD_SHARE_CPUPOWER \
| 0*SD_SHARE_PKG_RESOURCES \
| 0*SD_SERIALIZE \
OpenPOWER on IntegriCloud