diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 06:07:46 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 06:07:46 +0100 |
| commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
| tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /mm | |
| parent | e1000: Fixes for 8357x (diff) | |
| parent | [PATCH] ieee80211_crypt_tkip depends on NET_RADIO (diff) | |
| download | linux-783e3385a134305d49d7b431df6e591265e7ec14.tar.xz linux-783e3385a134305d49d7b431df6e591265e7ec14.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'mm')
| -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, continue; } - if (!vma || (vma->vm_flags & VM_IO) + if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; |