diff options
author | Hugh Dickins <hughd@google.com> | 2011-03-22 19:33:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 20:44:09 -0400 |
commit | bee4c36a5cf5c9f63ce1d7372aa62045fbd16d47 (patch) | |
tree | d2c95aab9b12874d6675d529c3f8dd5cd2a35e10 /mm | |
parent | 8f7a66051b7523108c5aefb08c6a637e54aedc47 (diff) |
shmem: let shared anonymous be nonlinear again
Up to 2.6.22, you could use remap_file_pages(2) on a tmpfs file or a
shared mapping of /dev/zero or a shared anonymous mapping. In 2.6.23 we
disabled it by default, but set VM_CAN_NONLINEAR to enable it on safe
mappings. We made sure to set it in shmem_mmap() for tmpfs files, but
missed it in shmem_zero_setup() for the others. Fix that at last.
Reported-by: Kenny Simpson <theonetruekenny@yahoo.com>
Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 88593586bdb7..91ce9a1024d7 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -2793,5 +2793,6 @@ int shmem_zero_setup(struct vm_area_struct *vma) | |||
2793 | fput(vma->vm_file); | 2793 | fput(vma->vm_file); |
2794 | vma->vm_file = file; | 2794 | vma->vm_file = file; |
2795 | vma->vm_ops = &shmem_vm_ops; | 2795 | vma->vm_ops = &shmem_vm_ops; |
2796 | vma->vm_flags |= VM_CAN_NONLINEAR; | ||
2796 | return 0; | 2797 | return 0; |
2797 | } | 2798 | } |