diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 23:03:50 -0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 23:03:50 -0400 |
| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d /block | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| parent | 65fb0d23fcddd8697c871047b700c78817bdaa43 (diff) | |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk.h | 2 |
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) | |||
| 102 | const struct cpumask *mask = cpu_coregroup_mask(cpu); | 102 | const struct cpumask *mask = cpu_coregroup_mask(cpu); |
| 103 | return cpumask_first(mask); | 103 | return cpumask_first(mask); |
| 104 | #elif defined(CONFIG_SCHED_SMT) | 104 | #elif defined(CONFIG_SCHED_SMT) |
| 105 | return first_cpu(per_cpu(cpu_sibling_map, cpu)); | 105 | return cpumask_first(topology_thread_cpumask(cpu)); |
| 106 | #else | 106 | #else |
| 107 | return cpu; | 107 | return cpu; |
| 108 | #endif | 108 | #endif |