X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=mm%2Fslab.c;h=9a90b00d2f9140e2aaa67ecb949e33d89431e9c5;hb=12fe32e4f942ac5c71a4ab70b039fee65c0dc29d;hp=b584002850305662a665577a5b03ebe7c44a8f3b;hpb=2121db74ba0fd2259f0e2265511684fadda9ac49;p=linux-2.6-omap-h63xx.git

diff --git a/mm/slab.c b/mm/slab.c
index b5840028503..9a90b00d2f9 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1169,7 +1169,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;
@@ -4047,8 +4047,7 @@ static void cache_reap(struct work_struct *w)
 	struct kmem_cache *searchp;
 	struct kmem_list3 *l3;
 	int node = numa_node_id();
-	struct delayed_work *work =
-		container_of(w, struct delayed_work, work);
+	struct delayed_work *work = to_delayed_work(w);
 
 	if (!mutex_trylock(&cache_chain_mutex))
 		/* Give up. Setup the next iteration. */