aboutsummaryrefslogtreecommitdiff
path: root/drivers/xen/gntdev.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-01-19 12:04:37 +0800
committerAlex Shi <alex.shi@linaro.org>2017-01-19 12:04:37 +0800
commit2e2fb031287a5946d97b85769f80ca60f0166e15 (patch)
tree327758ae12bc31e290d48d8400c0c440fe7f5cd9 /drivers/xen/gntdev.c
parentab7f86e8cb2a22bc1850316700981b063ab67599 (diff)
parentcb370744bc101be91a0bc3e9fbdb670ab44df97d (diff)
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-17.02-rt
Diffstat (limited to 'drivers/xen/gntdev.c')
-rw-r--r--drivers/xen/gntdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index ee71baddbb10..e227eb09b1a0 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -804,7 +804,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
vma->vm_ops = &gntdev_vmops;
- vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP | VM_IO;
+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP | VM_MIXEDMAP;
if (use_ptemod)
vma->vm_flags |= VM_DONTCOPY;