From 185d174fb999b7ceb0204465e41e893d293db2bb Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 5 Nov 2008 16:52:08 +0100 Subject: [PATCH] --- yaml --- r: 118481 b: refs/heads/master c: 9fcd18c9e63e325dbd2b4c726623f760788d5aa8 h: refs/heads/master i: 118479: 8cebaedcea96ac57fea85a1e587a85a0c20645dc v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/topology.h | 7 ++++--- trunk/include/linux/topology.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 452d1b004c63..e781c1cc6502 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02479099c286894644f8e96c6bbb535ab64662fd +refs/heads/master: 9fcd18c9e63e325dbd2b4c726623f760788d5aa8 diff --git a/trunk/arch/x86/include/asm/topology.h b/trunk/arch/x86/include/asm/topology.h index 90ac7718469a..4850e4b02b61 100644 --- a/trunk/arch/x86/include/asm/topology.h +++ b/trunk/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, \ } diff --git a/trunk/include/linux/topology.h b/trunk/include/linux/topology.h index 2158fc0d5a56..34a7ee0ebed2 100644 --- a/trunk/include/linux/topology.h +++ b/trunk/include/linux/topology.h @@ -146,10 +146,10 @@ void arch_update_cpu_topology(void); .wake_idx = 1, \ .forkexec_idx = 1, \ .flags = SD_LOAD_BALANCE \ - | SD_BALANCE_NEWIDLE \ - | SD_BALANCE_FORK \ | SD_BALANCE_EXEC \ + | SD_BALANCE_FORK \ | SD_WAKE_AFFINE \ + | SD_WAKE_BALANCE \ | BALANCE_FOR_PKG_POWER,\ .last_balance = jiffies, \ .balance_interval = 1, \