[PATCH 04/12] sched: Seperate out build of CPU sched domain from __build_sched_domains

Andreas Herrmann
2009-08-18T10:56:01Z

kernel/sched.c | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index e696cd9..a2e09f4 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8619,6 +8619,22 @@ static struct sched_domain *__build_numa_sched_domains(struct s_data *d,
return sd;
}

+static struct sched_domain *__build_cpu_sched_domain(struct s_data *d,
+ const struct cpumask *cpu_map, struct sched_domain_attr *attr,
+ struct sched_domain *parent, int i)
+{
+ struct sched_domain *sd;
+ sd = &per_cpu(phys_domains, i).sd;
+ SD_INIT(sd, CPU);
+ set_domain_attribute(sd, attr);
+ cpumask_copy(sched_domain_span(sd), d->nodemask);
+ sd->parent = parent;
+ if (parent)
+ parent->child = sd;
+ cpu_to_phys_group(i, cpu_map, &sd->groups, d->tmpmask);
+ return sd;
+}
+
/*
* Build sched domains for a given set of cpus and attach the sched domains
* to the individual cpus
@@ -8648,15 +8664,7 @@ static int __build_sched_domains(const struct cpumask *cpu_map,
cpu_map);

sd = __build_numa_sched_domains(&d, cpu_map, attr, i);
- p = sd;
- sd = &per_cpu(phys_domains, i).sd;
- SD_INIT(sd, CPU);
- set_domain_attribute(sd, attr);
- cpumask_copy(sched_domain_span(sd), d.nodemask);
- sd->parent = p;
- if (p)
- p->child = sd;
- cpu_to_phys_group(i, cpu_map, &sd->groups, d.tmpmask);
+ sd = __build_cpu_sched_domain(&d, cpu_map, attr, sd, i);

#ifdef CONFIG_SCHED_MC
p = sd;
--
1.6.4