diff --git a/[refs] b/[refs] index 6fde33a1d94d..6be69d3e0ec2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa1a64ee12ae130706f3fc0007841ce9b0ddf9c2 +refs/heads/master: ed5297a94090d9a9f27b0ce1f9601ebe73561cff diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 2998cfc12f5b..cfce5f1f30f2 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -968,7 +968,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, continue; } - if (!vma || (vma->vm_flags & (VM_IO | VM_RESERVED)) + if (!vma || (vma->vm_flags & VM_IO) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT;