Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 329143
b: refs/heads/master
c: 1a1d433
h: refs/heads/master
i:
  329141: 123872f
  329139: 76dbb3e
  329135: f3ba09a
v: v3
  • Loading branch information
Stefano Stabellini authored and Konrad Rzeszutek Wilk committed Aug 23, 2012
1 parent 2e0624f commit 3bdd303
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bd3f79b71de0410352ab506496a467fcb0620912
refs/heads/master: 1a1d43318aeb74d679372c0b65029957be274529
3 changes: 3 additions & 0 deletions trunk/arch/x86/xen/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) ==
Expand Down
4 changes: 0 additions & 4 deletions trunk/drivers/xen/privcmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3bdd303

Please sign in to comment.