cpumask: Replace cpu_coregroup_map with cpu_coregroup_map() cpu_coregroup_map returned a cpumask_t: it's going away. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- block/blk.h | 4 ++-- kernel/sched.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff -r de5f2bede0a7 block/blk.h --- a/block/blk.h Tue Nov 18 21:49:07 2008 +1030 +++ b/block/blk.h Tue Nov 18 21:57:33 2008 +1030 @@ -99,8 +99,8 @@ static 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 diff -r de5f2bede0a7 kernel/sched.c --- a/kernel/sched.c Tue Nov 18 21:49:07 2008 +1030 +++ b/kernel/sched.c Tue Nov 18 21:57:33 2008 +1030 @@ -7115,7 +7115,7 @@ { 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) @@ -7446,7 +7446,7 @@ 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; @@ -7483,7 +7483,7 @@ #ifdef CONFIG_SCHED_MC /* Set up multi-core groups */ for_each_cpu(i, cpu_map) { - *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;