Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[cascardo/linux.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 03aa851..73cf098 100644 (file)
--- 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;