From 153c69b4028a24afd30b065c7f60009e0d6c338a Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 10 Oct 2012 14:56:00 +1100 Subject: [PATCH] --- yaml --- r: 334178 b: refs/heads/master c: fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db h: refs/heads/master 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 e035130eef0e..5e9772cecb76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3617f72036c909e1f6086b5b9e364e0ef90a6da +refs/heads/master: fd3bc66f1dd5d062b5f0a7afc90c69d8da5b42db 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;