diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 12:44:33 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-15 12:44:33 -0700 |
| commit | 460aebac739df78b0e40a347934fdea377310577 (patch) | |
| tree | 6082a8c5b5ecee1b8c3437f337f0cefca930f75f /mm/mlock.c | |
| parent | 4b0d3f0fde41a3c4454adb4d474618c23cfd4131 (diff) | |
| parent | 5d5a08003d3e678372e375d99c65a24e0d33d2f5 (diff) | |
Merge branches 'doc.2013.09.25b' and 'fixes.2013.09.23b' into HEAD
doc.2013.09.25b: Topic branch for documentation updates.
fixes.2013.09.23b: Topic branch for miscellaneous fixes.
Diffstat (limited to 'mm/mlock.c')
| -rw-r--r-- | mm/mlock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index d63802663242..67ba6da7d0e3 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -736,6 +736,7 @@ static int do_mlockall(int flags) /* Ignore errors */ mlock_fixup(vma, &prev, vma->vm_start, vma->vm_end, newflags); + cond_resched(); } out: return 0; |