summaryrefslogtreecommitdiffstats
path: root/block/blk.h
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-03-13 05:19:46 +0100
committerRusty Russell <rusty@rustcorp.com.au>2009-03-13 05:19:46 +0100
commitc69fc56de1df5769f2ec69c915c7ad5afe63804c (patch)
tree18cc8d2ad5d6643edf8b73a3a7d26c55b2125d25 /block/blk.h
parentMerge branch 'x86/core' into cpus4096 (diff)
downloadlinux-c69fc56de1df5769f2ec69c915c7ad5afe63804c.tar.xz
linux-c69fc56de1df5769f2ec69c915c7ad5afe63804c.zip
cpumask: use topology_core_cpumask/topology_thread_cpumask instead of cpu_core_map/cpu_sibling_map
Impact: cleanup This is presumably what those definitions are for, and while all archs define cpu_core_map/cpu_sibling map, that's changing (eg. x86 wants to change it to a pointer). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'block/blk.h')
-rw-r--r--block/blk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h
index 0dce92c37496..3ee94358b43d 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -102,7 +102,7 @@ static inline int blk_cpu_to_group(int cpu)
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));
+ return cpumask_first(topology_thread_cpumask(cpu));
#else
return cpu;
#endif