diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:10:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:10:38 -0400 |
| commit | 6e958d73c25eecaf02a1998cda9ec8ce8da11042 (patch) | |
| tree | 94b8d48d268297925aa02f8ab358274f878bae9e /arch/x86 | |
| parent | 7811a32407b971d9086c46403124f1453b95c430 (diff) | |
| parent | 92f6a5e37a2e2d3342dafb2b39c2f8bc340bbf84 (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: Do less agressive buddy clearing
sched: Disable SD_PREFER_LOCAL for MC/CPU domains
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/topology.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 25a92842dd99..d823c245f63b 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
| @@ -143,6 +143,7 @@ extern unsigned long node_remap_size[]; | |||
| 143 | | 1*SD_BALANCE_FORK \ | 143 | | 1*SD_BALANCE_FORK \ |
| 144 | | 0*SD_BALANCE_WAKE \ | 144 | | 0*SD_BALANCE_WAKE \ |
| 145 | | 1*SD_WAKE_AFFINE \ | 145 | | 1*SD_WAKE_AFFINE \ |
| 146 | | 1*SD_PREFER_LOCAL \ | ||
| 146 | | 0*SD_SHARE_CPUPOWER \ | 147 | | 0*SD_SHARE_CPUPOWER \ |
| 147 | | 0*SD_POWERSAVINGS_BALANCE \ | 148 | | 0*SD_POWERSAVINGS_BALANCE \ |
| 148 | | 0*SD_SHARE_PKG_RESOURCES \ | 149 | | 0*SD_SHARE_PKG_RESOURCES \ |