diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 425244988bb2..39fdfb14eeaa 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1967,7 +1967,7 @@ static int kswapd(void *p) | |||
1967 | struct reclaim_state reclaim_state = { | 1967 | struct reclaim_state reclaim_state = { |
1968 | .reclaimed_slab = 0, | 1968 | .reclaimed_slab = 0, |
1969 | }; | 1969 | }; |
1970 | node_to_cpumask_ptr(cpumask, pgdat->node_id); | 1970 | const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id); |
1971 | 1971 | ||
1972 | lockdep_set_current_reclaim_state(GFP_KERNEL); | 1972 | lockdep_set_current_reclaim_state(GFP_KERNEL); |
1973 | 1973 | ||
@@ -2204,7 +2204,9 @@ static int __devinit cpu_callback(struct notifier_block *nfb, | |||
2204 | if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { | 2204 | if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { |
2205 | for_each_node_state(nid, N_HIGH_MEMORY) { | 2205 | for_each_node_state(nid, N_HIGH_MEMORY) { |
2206 | pg_data_t *pgdat = NODE_DATA(nid); | 2206 | pg_data_t *pgdat = NODE_DATA(nid); |
2207 | node_to_cpumask_ptr(mask, pgdat->node_id); | 2207 | const struct cpumask *mask; |
2208 | |||
2209 | mask = cpumask_of_node(pgdat->node_id); | ||
2208 | 2210 | ||
2209 | if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids) | 2211 | if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids) |
2210 | /* One of our CPUs online: restore mask */ | 2212 | /* One of our CPUs online: restore mask */ |