diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index d2d16d1273b1..42929239830f 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -7119,7 +7119,7 @@ cpu_to_phys_group(int cpu, const cpumask_t *cpu_map, struct sched_group **sg, | |||
7119 | { | 7119 | { |
7120 | int group; | 7120 | int group; |
7121 | #ifdef CONFIG_SCHED_MC | 7121 | #ifdef CONFIG_SCHED_MC |
7122 | *mask = cpu_coregroup_map(cpu); | 7122 | *mask = *cpu_coregroup_mask(cpu); |
7123 | cpus_and(*mask, *mask, *cpu_map); | 7123 | cpus_and(*mask, *mask, *cpu_map); |
7124 | group = first_cpu(*mask); | 7124 | group = first_cpu(*mask); |
7125 | #elif defined(CONFIG_SCHED_SMT) | 7125 | #elif defined(CONFIG_SCHED_SMT) |
@@ -7485,7 +7485,7 @@ static int __build_sched_domains(const cpumask_t *cpu_map, | |||
7485 | sd = &per_cpu(core_domains, i); | 7485 | sd = &per_cpu(core_domains, i); |
7486 | SD_INIT(sd, MC); | 7486 | SD_INIT(sd, MC); |
7487 | set_domain_attribute(sd, attr); | 7487 | set_domain_attribute(sd, attr); |
7488 | sd->span = cpu_coregroup_map(i); | 7488 | sd->span = *cpu_coregroup_mask(i); |
7489 | cpus_and(sd->span, sd->span, *cpu_map); | 7489 | cpus_and(sd->span, sd->span, *cpu_map); |
7490 | sd->parent = p; | 7490 | sd->parent = p; |
7491 | p->child = sd; | 7491 | p->child = sd; |
@@ -7528,7 +7528,7 @@ static int __build_sched_domains(const cpumask_t *cpu_map, | |||
7528 | SCHED_CPUMASK_VAR(this_core_map, allmasks); | 7528 | SCHED_CPUMASK_VAR(this_core_map, allmasks); |
7529 | SCHED_CPUMASK_VAR(send_covered, allmasks); | 7529 | SCHED_CPUMASK_VAR(send_covered, allmasks); |
7530 | 7530 | ||
7531 | *this_core_map = cpu_coregroup_map(i); | 7531 | *this_core_map = *cpu_coregroup_mask(i); |
7532 | cpus_and(*this_core_map, *this_core_map, *cpu_map); | 7532 | cpus_and(*this_core_map, *this_core_map, *cpu_map); |
7533 | if (i != first_cpu(*this_core_map)) | 7533 | if (i != first_cpu(*this_core_map)) |
7534 | continue; | 7534 | continue; |