diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 14:06:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 14:06:41 +0200 |
| commit | 547b1e81afe3119f7daf702cc03b158495535a25 (patch) | |
| tree | c135d9a86162092fc748b1556b95db91b8b90cad /drivers/vfio/pci | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-547b1e81afe3119f7daf702cc03b158495535a25.tar.xz linux-547b1e81afe3119f7daf702cc03b158495535a25.zip | |
Fix staging driver use of VM_RESERVED
The VM_RESERVED flag was killed off in commit 314e51b9851b ("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>
Diffstat (limited to 'drivers/vfio/pci')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 6968b7232232..6d369fe9d30b 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -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; |