Merge branch 'linus' into core/urgent

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 62e7f62fb559..d196f46c8808 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1902,7 +1902,7 @@ static int kswapd(void *p)
         };
         node_to_cpumask_ptr(cpumask, pgdat->node_id);
 
-        if (!cpus_empty(*cpumask))
+        if (!cpumask_empty(cpumask))
                 set_cpus_allowed_ptr(tsk, cpumask);
         current->reclaim_state = &reclaim_state;
 
@@ -2141,7 +2141,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
                         pg_data_t *pgdat = NODE_DATA(nid);
                         node_to_cpumask_ptr(mask, pgdat->node_id);
 
-                        if (any_online_cpu(*mask) < nr_cpu_ids)
+                        if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids)
                                 /* One of our CPUs online: restore mask */
                                 set_cpus_allowed_ptr(pgdat->kswapd, mask);
                 }