Merge branch 'linus' into tracing/kmemtrace2

1 files changed, 2 insertions, 2 deletions

diff --git a/block/blk.h b/block/blk.h
index d2e49af90db5..6e1ed40534e9 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -99,8 +99,8 @@ static inline int queue_congestion_off_threshold(struct request_queue *q)
 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