From 3ccd499a21c815bf75bcc82354dd1d9a7ff0f378 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 9 Oct 2012 09:54:30 -0700 Subject: [PATCH] --- yaml --- r: 332889 b: refs/heads/master c: 9836d3458cde82626f2828ca6bd44c4a02b56e63 h: refs/heads/master i: 332887: 7a804b76fab8454732c8f94e3c76382c46e752f3 v: v3 --- [refs] | 2 +- trunk/drivers/vfio/pci/vfio_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8515a588e6dd..78638f5f3fcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5457982641fb3f5fb08ce22a853dd5474645c66d +refs/heads/master: 9836d3458cde82626f2828ca6bd44c4a02b56e63 diff --git a/trunk/drivers/vfio/pci/vfio_pci.c b/trunk/drivers/vfio/pci/vfio_pci.c index 6968b7232232..6d369fe9d30b 100644 --- a/trunk/drivers/vfio/pci/vfio_pci.c +++ b/trunk/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;