Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 5 insertions, 4 deletions

diff --git a/mm/mlock.c b/mm/mlock.c
index 3035a56e7616..e125156c664e 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -173,12 +173,13 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
                   (atomic_read(&mm->mm_users) != 0));
 
         /*
-         * mlock:   don't page populate if page has PROT_NONE permission.
-         * munlock: the pages always do munlock althrough
-         *          its has PROT_NONE permission.
+         * mlock:   don't page populate if vma has PROT_NONE permission.
+         * munlock: always do munlock although the vma has PROT_NONE
+         *          permission, or SIGKILL is pending.
          */
         if (!mlock)
-                gup_flags |= GUP_FLAGS_IGNORE_VMA_PERMISSIONS;
+                gup_flags |= GUP_FLAGS_IGNORE_VMA_PERMISSIONS |
+                             GUP_FLAGS_IGNORE_SIGKILL;
 
         if (vma->vm_flags & VM_WRITE)
                 gup_flags |= GUP_FLAGS_WRITE;