diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-10 10:16:17 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-10 10:16:17 +0000 |
commit | d79aab2852cd89ed8b792d633c9bebc0c6af74ac (patch) | |
tree | 029dec967090ff96578df1fcf70d358a34c2dc3e /arch/x86/include/asm/topology.h | |
parent | 039d35267d79b9feae3a850f54b2677dea019f0a (diff) | |
parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'arch/x86/include/asm/topology.h')
-rw-r--r-- | arch/x86/include/asm/topology.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 90ac7718469..4850e4b02b6 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -154,7 +154,7 @@ extern unsigned long node_remap_size[]; #endif -/* sched_domains SD_NODE_INIT for NUMAQ machines */ +/* sched_domains SD_NODE_INIT for NUMA machines */ #define SD_NODE_INIT (struct sched_domain) { \ .min_interval = 8, \ .max_interval = 32, \ @@ -169,8 +169,9 @@ extern unsigned long node_remap_size[]; .flags = SD_LOAD_BALANCE \ | SD_BALANCE_EXEC \ | SD_BALANCE_FORK \ - | SD_SERIALIZE \ - | SD_WAKE_BALANCE, \ + | SD_WAKE_AFFINE \ + | SD_WAKE_BALANCE \ + | SD_SERIALIZE, \ .last_balance = jiffies, \ .balance_interval = 1, \ } |