aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r--mm/vmscan.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 479e46719394..f74a61e522f4 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1963,7 +1963,7 @@ static int kswapd(void *p)
1963 struct reclaim_state reclaim_state = { 1963 struct reclaim_state reclaim_state = {
1964 .reclaimed_slab = 0, 1964 .reclaimed_slab = 0,
1965 }; 1965 };
1966 node_to_cpumask_ptr(cpumask, pgdat->node_id); 1966 const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id);
1967 1967
1968 lockdep_set_current_reclaim_state(GFP_KERNEL); 1968 lockdep_set_current_reclaim_state(GFP_KERNEL);
1969 1969
@@ -2200,7 +2200,9 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
2200 if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { 2200 if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
2201 for_each_node_state(nid, N_HIGH_MEMORY) { 2201 for_each_node_state(nid, N_HIGH_MEMORY) {
2202 pg_data_t *pgdat = NODE_DATA(nid); 2202 pg_data_t *pgdat = NODE_DATA(nid);
2203 node_to_cpumask_ptr(mask, pgdat->node_id); 2203 const struct cpumask *mask;
2204
2205 mask = cpumask_of_node(pgdat->node_id);
2204 2206
2205 if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids) 2207 if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids)
2206 /* One of our CPUs online: restore mask */ 2208 /* One of our CPUs online: restore mask */