Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14603
b: refs/heads/master
c: ed5297a
h: refs/heads/master
i:
  14601: aa71677
  14599: 9ccd2fb
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Nov 22, 2005
1 parent a887fb5 commit d969f0f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa1a64ee12ae130706f3fc0007841ce9b0ddf9c2
refs/heads/master: ed5297a94090d9a9f27b0ce1f9601ebe73561cff
2 changes: 1 addition & 1 deletion trunk/mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit d969f0f

Please sign in to comment.