---

yaml --- r: 282089 b: refs/heads/master c: a63f985 h: refs/heads/master i: 282087: 01a132e v: v3
git-mirror · Dec 16, 2011 · 0915223 · 0915223
1 parent c68f801
commit 0915223
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9f0fec3f5d406c500861da779d16a779a110055
+refs/heads/master: a63f9857134b0b6565bf86a06a94df876bdd18d3
diff --git a/trunk/drivers/xen/privcmd.c b/trunk/drivers/xen/privcmd.c
@@ -365,7 +365,6 @@ static long privcmd_ioctl(struct file *file,
 	return ret;
 }
 
-#ifndef HAVE_ARCH_PRIVCMD_MMAP
 static int privcmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
 	printk(KERN_DEBUG "privcmd_fault: vma=%p %lx-%lx, pgoff=%lx, uv=%p\n",
@@ -398,7 +397,6 @@ static int privcmd_enforce_singleshot_mapping(struct vm_area_struct *vma)
 {
 	return (xchg(&vma->vm_private_data, (void *)1) == NULL);
 }
-#endif
 
 const struct file_operations xen_privcmd_fops = {
 	.owner = THIS_MODULE,