diff --git a/[refs] b/[refs] index 1c8ca1cc05fc..a047cb827d56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 868a23a8043f2a3042dae60105c89bd4680187ba +refs/heads/master: 6700ec65c207068a81a535e9dca616fefac21671 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 303eb658b50b..cf8441345277 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -1963,11 +1963,10 @@ static int kswapd(void *p) struct reclaim_state reclaim_state = { .reclaimed_slab = 0, }; + node_to_cpumask_ptr(cpumask, pgdat->node_id); lockdep_set_current_reclaim_state(GFP_KERNEL); - node_to_cpumask_ptr(cpumask, pgdat->node_id); - if (!cpumask_empty(cpumask)) set_cpus_allowed_ptr(tsk, cpumask); current->reclaim_state = &reclaim_state;