diff --git a/[refs] b/[refs] index 7e986c8c411b..9d3a30017e0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35f8c1c343f2918ea24f05282d14e711887d8278 +refs/heads/master: 441c7416b55d3d48b4aaafc5bdd804092387d877 diff --git a/trunk/drivers/xen/xenfs/privcmd.c b/trunk/drivers/xen/xenfs/privcmd.c index c7192f314f86..6b602f505363 100644 --- a/trunk/drivers/xen/xenfs/privcmd.c +++ b/trunk/drivers/xen/xenfs/privcmd.c @@ -403,6 +403,10 @@ static long privcmd_ioctl(struct file *file, #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", + vma, vma->vm_start, vma->vm_end, + vmf->pgoff, vmf->virtual_address); + return VM_FAULT_SIGBUS; }