diff options
author | Anton Blanchard <anton@samba.org> | 2011-07-24 12:33:13 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 01:53:21 -0400 |
commit | 590e4d857153c5d4cf86052cdfd42cf9b0779841 (patch) | |
tree | b8de0d7c163b81050f8c95f1b59ccbf05aed5d8f | |
parent | a200d8e44649de2cbb39de95f42ad4ef5dc8dc22 (diff) |
sched: Allow SD_NODES_PER_DOMAIN to be overridden
We want to override the default value of SD_NODES_PER_DOMAIN on ppc64,
so move it into linux/topology.h.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | include/linux/topology.h | 4 | ||||
-rw-r--r-- | kernel/sched.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index fc839bfa7935..e26db031303b 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
@@ -201,6 +201,10 @@ int arch_update_cpu_topology(void); | |||
201 | .balance_interval = 64, \ | 201 | .balance_interval = 64, \ |
202 | } | 202 | } |
203 | 203 | ||
204 | #ifndef SD_NODES_PER_DOMAIN | ||
205 | #define SD_NODES_PER_DOMAIN 16 | ||
206 | #endif | ||
207 | |||
204 | #ifdef CONFIG_SCHED_BOOK | 208 | #ifdef CONFIG_SCHED_BOOK |
205 | #ifndef SD_BOOK_INIT | 209 | #ifndef SD_BOOK_INIT |
206 | #error Please define an appropriate SD_BOOK_INIT in include/asm/topology.h!!! | 210 | #error Please define an appropriate SD_BOOK_INIT in include/asm/topology.h!!! |
diff --git a/kernel/sched.c b/kernel/sched.c index ec5f472bc5b9..d258b2d9a66d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -6947,8 +6947,6 @@ static int __init isolated_cpu_setup(char *str) | |||
6947 | 6947 | ||
6948 | __setup("isolcpus=", isolated_cpu_setup); | 6948 | __setup("isolcpus=", isolated_cpu_setup); |
6949 | 6949 | ||
6950 | #define SD_NODES_PER_DOMAIN 16 | ||
6951 | |||
6952 | #ifdef CONFIG_NUMA | 6950 | #ifdef CONFIG_NUMA |
6953 | 6951 | ||
6954 | /** | 6952 | /** |