Fix staging driver use of VM_RESERVED
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Oct 2012 12:06:41 +0000 (21:06 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Oct 2012 12:06:41 +0000 (21:06 +0900)
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>
drivers/vfio/pci/vfio_pci.c

index 6968b7232232a07c8f6cdd96e6634cad2435511b..6d369fe9d30bef6abb0dae1db22e55ec181d9e92 100644 (file)
@@ -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;