1 files changed, 2 insertions, 3 deletions

diff --git a/mm/slab.c b/mm/slab.c
index b58400285030..9a90b00d2f91 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. */