Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc4ac63 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

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: default avatarHugh Dickins <hugh@veritas.com>
Acked-by: default avatarJes Sorensen <jes@sgi.com>
Cc: Dmitry Monakhov <dmonakhov@sw.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b49ad484

drivers/char/mspec.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma, int type) 
	vdata->refcnt = ATOMIC_INIT(1);

	vdata->refcnt = ATOMIC_INIT(1);

	vma->vm_private_data = vdata;

	vma->vm_private_data = vdata;





	vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED | VM_PFNMAP);

	vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP);

	if (vdata->type == MSPEC_FETCHOP || vdata->type == MSPEC_UNCACHED)

	if (vdata->type == MSPEC_FETCHOP || vdata->type == MSPEC_UNCACHED)

		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	vma->vm_ops = &mspec_vm_ops;

	vma->vm_ops = &mspec_vm_ops;