Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

[linux-2.6-omap-h63xx.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 0dce92c37496faf8b187741de6d169869019e9b7..3ee94358b43d0ba8d1194daaac7d34534e87bfa5 100644 (file)
--- 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