From 26aa0e70d9bea004da883d9647dec3f1524992a3 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Oct 2012 21:06:41 +0900
Subject: [PATCH] --- yaml --- r: 332489 b: refs/heads/master c:
 547b1e81afe3119f7daf702cc03b158495535a25 h: refs/heads/master i:   332487:
 270bf522ace3da61350f73bccca957b2e19cd2c9 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 1953e1a4feac..7e18395fb401 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e2d8656f5e8aa214e66b462680cf86b210b74a8
+refs/heads/master: 547b1e81afe3119f7daf702cc03b158495535a25
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;