From 3bdd303d82af73cc7b0a3711fc5d1a66b9dcf281 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 22 Aug 2012 17:20:16 +0100 Subject: [PATCH] --- yaml --- r: 329143 b: refs/heads/master c: 1a1d43318aeb74d679372c0b65029957be274529 h: refs/heads/master i: 329141: 123872f7686a81b5ab9826dad917a7079a5ba13e 329139: 76dbb3eb6ba111989b09905c5d914a28fe908c55 329135: f3ba09ad329391cd9055e7e3a9a431c11ee416fd v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/mmu.c | 3 +++ trunk/drivers/xen/privcmd.c | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 92c4353a409a..78c18d03f631 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd3f79b71de0410352ab506496a467fcb0620912 +refs/heads/master: 1a1d43318aeb74d679372c0b65029957be274529 diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 3a73785631ce..885a22354a96 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/arch/x86/xen/mmu.c @@ -2310,6 +2310,9 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long range; int err = 0; + if (xen_feature(XENFEAT_auto_translated_physmap)) + return -EINVAL; + prot = __pgprot(pgprot_val(prot) | _PAGE_IOMAP); BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_RESERVED | VM_IO)) == diff --git a/trunk/drivers/xen/privcmd.c b/trunk/drivers/xen/privcmd.c index ccee0f16bcf8..85226cbeca24 100644 --- a/trunk/drivers/xen/privcmd.c +++ b/trunk/drivers/xen/privcmd.c @@ -380,10 +380,6 @@ static struct vm_operations_struct privcmd_vm_ops = { static int privcmd_mmap(struct file *file, struct vm_area_struct *vma) { - /* Unsupported for auto-translate guests. */ - if (xen_feature(XENFEAT_auto_translated_physmap)) - return -ENOSYS; - /* 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;