Skip to content

Commit

Permalink
Fix staging driver use of VM_RESERVED
Browse files Browse the repository at this point in the history
The VM_RESERVED flag was killed off in commit 314e51b ("mm: kill
vma flag VM_RESERVED and mm->reserved_vm counter"), and replaced by the
proper semantic flags (eg "don't core-dump" etc).  But there was a new
use of VM_RESERVED that got missed by the merge.

Fix the remaining use of VM_RESERVED in the vfio_pci driver, replacing
the VM_RESERVED flag with VM_DONTEXPAND | VM_DONTDUMP.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation,org>
  • Loading branch information
Linus Torvalds committed Oct 9, 2012
1 parent 9e2d865 commit 547b1e8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/vfio/pci/vfio_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma)
}

vma->vm_private_data = vdev;
vma->vm_flags |= (VM_IO | VM_RESERVED);
vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

phys = (pci_resource_start(pdev, index) >> PAGE_SHIFT) + pgoff;
Expand Down

0 comments on commit 547b1e8

Please sign in to comment.