diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-09-16 10:10:44 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2014-09-16 10:10:44 -0700 |
| commit | 96b4672703ed4538c7fc25de36df4415a0ee237c (patch) | |
| tree | e5bb8f4c3eb41c5741a7b232cff8e502f6509fc3 /mm | |
| parent | e98d06dd6cd791b5138b0fc6c14a9c0b4d1f2e72 (diff) | |
| parent | a53dd6a65668850493cce94395c1b88a015eb338 (diff) | |
Merge branch 'rcu-tasks.2014.09.10a' into HEAD
rcu-tasks.2014.09.10a: Add RCU-tasks flavor of RCU.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index ce84cb0b83ef..ab3150c26711 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -789,7 +789,7 @@ static int do_mlockall(int flags) /* Ignore errors */ mlock_fixup(vma, &prev, vma->vm_start, vma->vm_end, newflags); - cond_resched(); + cond_resched_rcu_qs(); } out: return 0; |