cpumask: Replace cpu_coregroup_map with cpu_coregroup_map()
PATCH 4/4 cpumask: Replace cpu_coregroup_map with cpu_coregroup_map()
cpu_coregroup_map returned a cpumask_t: it's going away.
(Note, the sched part of this patch won't apply meaningfully to the sched tree, but I'm posting it to show the goal).
Signed-off-by Rusty Russell <[email protected]>
Signed-off-by Mike Travis <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Ingo Molnar <[email protected]>
--- block/blk.h | 4 ++-- kernel/sched.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
block/blk.h +2 -2
@@ -99,8 +99,8 @@ static inline int blk_cpu_to_group(int cstatic inline int blk_cpu_to_group (int cpu) {#ifdef CONFIG_SCHED_MC -cpumask_t mask =cpu_coregroup_map (cpu); -return first_cpu (mask); +const struct cpumask *mask =cpu_coregroup_mask (cpu); +return cpumask_first (mask);#elif defined(CONFIG_SCHED_SMT )return first_cpu (per_cpu (cpu_sibling_map, cpu));#else
kernel/sched.c +3 -3
@@ -7116,7 +7116,7 @@ cpu_to_phys_group(int cpu, const cpumask {int group;#ifdef CONFIG_SCHED_MC - *mask =cpu_coregroup_map (cpu); + *mask = *cpu_coregroup_mask (cpu);cpus_and (*mask, *mask, *cpu_map); group =first_cpu (*mask);#elif defined(CONFIG_SCHED_SMT )
@@ -7482,7 +7482,7 @@ static int __build_sched_domains(const c sd = &per_cpu (core_domains, i);SD_INIT (sd,MC );set_domain_attribute (sd, attr); - sd->span =cpu_coregroup_map (i); + sd->span = *cpu_coregroup_mask (i);cpus_and (sd->span, sd->span, *cpu_map); sd->parent = p; p->child = sd;
@@ -7525,7 +7525,7 @@ static int __build_sched_domains(const cSCHED_CPUMASK_VAR (this_core_map, allmasks);SCHED_CPUMASK_VAR (send_covered, allmasks); - *this_core_map =cpu_coregroup_map (i); + *this_core_map = *cpu_coregroup_mask (i);cpus_and (*this_core_map, *this_core_map, *cpu_map);if (i !=first_cpu (*this_core_map))continue ;