diff options
| author |  Rusty Russell <rusty@rustcorp.com.au>
| 2009-03-31 13:33:50 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au>
| 2009-03-31 13:33:50 +1030 |
| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d /mm/slab.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | Merge branch 'linus' into cpumask-for-linus (diff) | |
| download | linux-558f6ab9106e6be701acb0257e7171df1bbccf04.tar.gz linux-558f6ab9106e6be701acb0257e7171df1bbccf04.tar.bz2 linux-558f6ab9106e6be701acb0257e7171df1bbccf04.zip | |
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 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c index 825c606f691d..59839d7ee5b3 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1160,7 +1160,7 @@ static void __cpuinit cpuup_canceled(long cpu) struct kmem_cache *cachep; struct kmem_list3 *l3 = NULL; int node = cpu_to_node(cpu); - node_to_cpumask_ptr(mask, node); + const struct cpumask *mask = cpumask_of_node(node); list_for_each_entry(cachep, &cache_chain, next) { struct array_cache *nc; |