summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-11-11 12:37:43 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-11 12:37:43 -0800
commite060e7af98182494b764d002eba7fa022fe91bdf (patch)
tree556b1a8c0d5cddf245c18bf220259691fb8f31d3 /drivers/xen
parent313e74412105c670ff8900ec8099a3a5df1fa83c (diff)
downloadlinux-3.10-e060e7af98182494b764d002eba7fa022fe91bdf.tar.gz
linux-3.10-e060e7af98182494b764d002eba7fa022fe91bdf.tar.bz2
linux-3.10-e060e7af98182494b764d002eba7fa022fe91bdf.zip
xen: set vma flag VM_PFNMAP in the privcmd mmap file_op
Set VM_PFNMAP in the privcmd mmap file_op, rather than later in xen_remap_domain_mfn_range when it is too late because vma_wants_writenotify has already been called and vm_page_prot has already been modified. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/xenfs/privcmd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/xen/xenfs/privcmd.c b/drivers/xen/xenfs/privcmd.c
index 2eb04c84251..88474d460d8 100644
--- a/drivers/xen/xenfs/privcmd.c
+++ b/drivers/xen/xenfs/privcmd.c
@@ -380,8 +380,9 @@ static int privcmd_mmap(struct file *file, struct vm_area_struct *vma)
if (xen_feature(XENFEAT_auto_translated_physmap))
return -ENOSYS;
- /* DONTCOPY is essential for Xen as copy_page_range is broken. */
- vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY;
+ /* DONTCOPY is essential for Xen because copy_page_range doesn't know
+ * how to recreate these mappings */
+ vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY | VM_PFNMAP;
vma->vm_ops = &privcmd_vm_ops;
vma->vm_private_data = NULL;