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 e89517141657..592bb9619f75 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 if (!cpumask_empty(cpumask)) 1968 if (!cpumask_empty(cpumask))
1969 set_cpus_allowed_ptr(tsk, cpumask); 1969 set_cpus_allowed_ptr(tsk, cpumask);
@@ -2198,7 +2198,9 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
2198 if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { 2198 if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
2199 for_each_node_state(nid, N_HIGH_MEMORY) { 2199 for_each_node_state(nid, N_HIGH_MEMORY) {
2200 pg_data_t *pgdat = NODE_DATA(nid); 2200 pg_data_t *pgdat = NODE_DATA(nid);
2201 node_to_cpumask_ptr(mask, pgdat->node_id); 2201 const struct cpumask *mask;
2202
2203 mask = cpumask_of_node(pgdat->node_id);
2202 2204
2203 if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids) 2205 if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids)
2204 /* One of our CPUs online: restore mask */ 2206 /* One of our CPUs online: restore mask */