1 files changed, 8 insertions, 10 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 4046434046e6..f80a5b7c057f 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1647,11 +1647,10 @@ static int kswapd(void *p)
         struct reclaim_state reclaim_state = {
                 .reclaimed_slab = 0,
         };
-        cpumask_t cpumask;
+        node_to_cpumask_ptr(cpumask, pgdat->node_id);
 
-        cpumask = node_to_cpumask(pgdat->node_id);
-        if (!cpus_empty(cpumask))
-                set_cpus_allowed(tsk, cpumask);
+        if (!cpus_empty(*cpumask))
+                set_cpus_allowed_ptr(tsk, cpumask);
         current->reclaim_state = &reclaim_state;
 
         /*
@@ -1880,17 +1879,16 @@ out:
 static int __devinit cpu_callback(struct notifier_block *nfb,
                                   unsigned long action, void *hcpu)
 {
-        pg_data_t *pgdat;
-        cpumask_t mask;
         int nid;
 
         if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
                 for_each_node_state(nid, N_HIGH_MEMORY) {
-                        pgdat = NODE_DATA(nid);
-                        mask = node_to_cpumask(pgdat->node_id);
-                        if (any_online_cpu(mask) != NR_CPUS)
+                        pg_data_t *pgdat = NODE_DATA(nid);
+                        node_to_cpumask_ptr(mask, pgdat->node_id);
+
+                        if (any_online_cpu(*mask) < nr_cpu_ids)
                                 /* One of our CPUs online: restore mask */
-                                set_cpus_allowed(pgdat->kswapd, mask);
+                                set_cpus_allowed_ptr(pgdat->kswapd, mask);
                 }
         }
         return NOTIFY_OK;