diff --git a/[refs] b/[refs]
index 40a2c633c6f3..d6809f250e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1fc057c79cb2d27602fb3ad08a031f13459ef27
+refs/heads/master: 3e597945384dee1457240158eb81e3afb90b68c2
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 62e7f62fb559..240f062f71f1 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -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);
 		}