diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
| commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
| tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /mm/memory.c | |
| parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 47c533eaa072..d22f78c8a381 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1009,7 +1009,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
| 1009 | continue; | 1009 | continue; |
| 1010 | } | 1010 | } |
| 1011 | 1011 | ||
| 1012 | if (!vma || (vma->vm_flags & VM_IO) | 1012 | if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP)) |
| 1013 | || !(vm_flags & vma->vm_flags)) | 1013 | || !(vm_flags & vma->vm_flags)) |
| 1014 | return i ? : -EFAULT; | 1014 | return i ? : -EFAULT; |
| 1015 | 1015 | ||