diff options
| author | Hugh Dickins <hugh@veritas.com> | 2005-11-22 06:32:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-22 18:13:41 +0100 |
| commit | ed5297a94090d9a9f27b0ce1f9601ebe73561cff (patch) | |
| tree | 00d28144ae949b3f9d566279cb12be0c802f86e6 /mm/memory.c | |
| parent | [PATCH] uml: eliminate use of libc PAGE_SIZE (diff) | |
| download | linux-ed5297a94090d9a9f27b0ce1f9601ebe73561cff.tar.xz linux-ed5297a94090d9a9f27b0ce1f9601ebe73561cff.zip | |
[PATCH] unpaged: get_user_pages VM_RESERVED
The PageReserved removal in 2.6.15-rc1 prohibited get_user_pages on the areas
flagged VM_RESERVED in place of PageReserved. That is correct in theory - we
ought not to interfere with struct pages in such a reserved area; but in
practice it broke BTTV for one.
So revert to prohibiting only on VM_IO: if someone gets into trouble with
get_user_pages on VM_RESERVED, it'll just be a "don't do that".
You can argue that videobuf_mmap_mapper shouldn't set VM_RESERVED in the first
place, but now's not the time for breaking drivers without notice.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 2998cfc12f5b..cfce5f1f30f2 100644 --- a/mm/memory.c +++ b/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; |