Skip to content

Commit

Permalink
sched: Consolidate definition of variable sd in __build_sched_domains
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20090818110229.GM29515@alberich.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Andreas Herrmann authored and Ingo Molnar committed Aug 18, 2009
1 parent 0601a88 commit 294b0c9
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -8678,6 +8678,7 @@ static int __build_sched_domains(const struct cpumask *cpu_map,
{
enum s_alloc alloc_state = sa_none;
struct s_data d;
struct sched_domain *sd;
int i;
#ifdef CONFIG_NUMA
d.sd_allnodes = 0;
Expand All @@ -8692,8 +8693,6 @@ static int __build_sched_domains(const struct cpumask *cpu_map,
* Set up domains for cpus specified by the cpu_map.
*/
for_each_cpu(i, cpu_map) {
struct sched_domain *sd;

cpumask_and(d.nodemask, cpumask_of_node(cpu_to_node(i)),
cpu_map);

Expand Down Expand Up @@ -8725,22 +8724,19 @@ static int __build_sched_domains(const struct cpumask *cpu_map,
/* Calculate CPU power for physical packages and nodes */
#ifdef CONFIG_SCHED_SMT
for_each_cpu(i, cpu_map) {
struct sched_domain *sd = &per_cpu(cpu_domains, i).sd;

sd = &per_cpu(cpu_domains, i).sd;
init_sched_groups_power(i, sd);
}
#endif
#ifdef CONFIG_SCHED_MC
for_each_cpu(i, cpu_map) {
struct sched_domain *sd = &per_cpu(core_domains, i).sd;

sd = &per_cpu(core_domains, i).sd;
init_sched_groups_power(i, sd);
}
#endif

for_each_cpu(i, cpu_map) {
struct sched_domain *sd = &per_cpu(phys_domains, i).sd;

sd = &per_cpu(phys_domains, i).sd;
init_sched_groups_power(i, sd);
}

Expand All @@ -8759,7 +8755,6 @@ static int __build_sched_domains(const struct cpumask *cpu_map,

/* Attach the domains */
for_each_cpu(i, cpu_map) {
struct sched_domain *sd;
#ifdef CONFIG_SCHED_SMT
sd = &per_cpu(cpu_domains, i).sd;
#elif defined(CONFIG_SCHED_MC)
Expand Down

0 comments on commit 294b0c9

Please sign in to comment.