Messages in this thread Patch in this message | | | Date | Wed, 08 Sep 2004 22:50:03 +1000 | From | Nick Piggin <> | Subject | [PATCH 1/3] sched: trivial changes |
| |
Couple of trival changes before the hotplug stuff.
Make a definition static and slightly sanitize ifdefs.
Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
---
linux-2.6-npiggin/kernel/sched.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff -puN kernel/sched.c~sched-trivial kernel/sched.c --- linux-2.6/kernel/sched.c~sched-trivial 2004-09-08 21:01:53.000000000 +1000 +++ linux-2.6-npiggin/kernel/sched.c 2004-09-08 22:39:38.000000000 +1000 @@ -247,9 +247,7 @@ struct sched_group { /* * CPU power of this group, SCHED_LOAD_SCALE being max power for a - * single CPU. This should be read only (except for setup). Although - * it will need to be written to at cpu hot(un)plug time, perhaps the - * cpucontrol semaphore will provide enough exclusion? + * single CPU. This is read only (except for setup, hotplug CPU). */ unsigned long cpu_power; }; @@ -4053,7 +4051,8 @@ static void cpu_attach_domain(struct sch * in arch code. That defines the number of nearby nodes in a node's top * level scheduling domain. */ -#if defined(CONFIG_NUMA) && defined(SD_NODES_PER_DOMAIN) +#ifdef CONFIG_NUMA +#ifdef SD_NODES_PER_DOMAIN /** * find_next_best_node - find the next node to include in a sched_domain * @node: node whose sched_domain we're building @@ -4100,7 +4099,7 @@ static int __init find_next_best_node(in * should be one that prevents unnecessary balancing, but also spreads tasks * out optimally. */ -cpumask_t __init sched_domain_node_span(int node) +static cpumask_t __init sched_domain_node_span(int node) { int i; cpumask_t span; @@ -4119,12 +4118,13 @@ cpumask_t __init sched_domain_node_span( return span; } -#else /* CONFIG_NUMA && SD_NODES_PER_DOMAIN */ -cpumask_t __init sched_domain_node_span(int node) +#else /* SD_NODES_PER_DOMAIN */ +static cpumask_t __init sched_domain_node_span(int node) { return cpu_possible_map; } -#endif /* CONFIG_NUMA && SD_NODES_PER_DOMAIN */ +#endif /* SD_NODES_PER_DOMAIN */ +#endif /* CONFIG_NUMA */ #ifdef CONFIG_SCHED_SMT static DEFINE_PER_CPU(struct sched_domain, cpu_domains); _
| |