diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:31:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:31:44 +0000 |
| commit | af1d34c770588a9ec6041292b7cd08e2fbc4f3a3 (patch) | |
| tree | f331af86ca3192aaf0a506fb4c55b05db07a1eb1 /drivers/xen/gntdev.c | |
| parent | c228c8e94b9e56032d475abc8f5978a73ac3f699 (diff) | |
| parent | 757bcff73ad4726504a3f40d12a970a593249350 (diff) | |
Merge tag 'v3.14.60' into linux-linaro-lsk-v3.14lsk-v3.14-16.02
This is the 3.14.60 stable release
# gpg: Signature made Fri 29 Jan 2016 06:00:43 GMT using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 647F 2865 4894 E3BD 4571 99BE 38DB BDC8 6092 693E
Diffstat (limited to 'drivers/xen/gntdev.c')
| -rw-r--r-- | drivers/xen/gntdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 91cc44611062..7ffbb9390628 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -765,7 +765,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; + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP | VM_IO; if (use_ptemod) vma->vm_flags |= VM_DONTCOPY; |