adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sched: Consolidate definition of variable sd in __build_sched_domains

Browse source 
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>
This commit is contained in:
Andreas Herrmann 2009-08-18 13:02:29 +02:00 committed by Ingo Molnar
parent 0601a88d8f
commit 294b0c9619
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/sched.c
View file

@ -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;
@ -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);
@ -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);
}
@ -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)