diff options
author | Hugh Dickins <hugh@veritas.com> | 2007-07-16 02:38:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:36 -0400 |
commit | 5dc4ac6324094cd52dc77ddf88296a94b90bbafc (patch) | |
tree | 11308d4def090b4e88737aad05d914f339ca7b52 | |
parent | b49ad484c54116862d717ffafcab1c9a46600b48 (diff) |
mspec_mmap: don't set VM_LOCKED
mspec_mmap was setting VM_LOCKED (without adjusting locked_vm): don't do
that, it serves no purpose in 2.6, other than to mess up the locked_vm
accounting - mspec's pages won't get reclaimed anyway. Thanks to Dmitry
Monakhov for raising the issue.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Jes Sorensen <jes@sgi.com>
Cc: Dmitry Monakhov <dmonakhov@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/mspec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c index 7ac30612068b..c716ef0dd370 100644 --- a/drivers/char/mspec.c +++ b/drivers/char/mspec.c | |||
@@ -265,7 +265,7 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, int type) | |||
265 | vdata->refcnt = ATOMIC_INIT(1); | 265 | vdata->refcnt = ATOMIC_INIT(1); |
266 | vma->vm_private_data = vdata; | 266 | vma->vm_private_data = vdata; |
267 | 267 | ||
268 | vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED | VM_PFNMAP); | 268 | vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP); |
269 | if (vdata->type == MSPEC_FETCHOP || vdata->type == MSPEC_UNCACHED) | 269 | if (vdata->type == MSPEC_FETCHOP || vdata->type == MSPEC_UNCACHED) |
270 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | 270 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); |
271 | vma->vm_ops = &mspec_vm_ops; | 271 | vma->vm_ops = &mspec_vm_ops; |