diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
commit | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (patch) | |
tree | b4b5e472bafb3d5d0d8ea26680e1d8cc87365c30 /mm/vmscan.c | |
parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
parent | efed792d6738964f399a508ef9e831cd60fa4657 (diff) | |
download | kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.gz kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.xz kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.zip |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 6177e3bcd66..ae6f4c174a1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1965,6 +1965,8 @@ static int kswapd(void *p) }; node_to_cpumask_ptr(cpumask, pgdat->node_id); + lockdep_set_current_reclaim_state(GFP_KERNEL); + if (!cpumask_empty(cpumask)) set_cpus_allowed_ptr(tsk, cpumask); current->reclaim_state = &reclaim_state; |