Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / misc / uacce / uacce.c

diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
index e45bfd409cc548e5a542bc412770a4a9f2fd7fa0..a5b8dab80c76be213f2d5cc9e84764292056f153 100644 (file)
--- a/drivers/misc/uacce/uacce.c
+++ b/drivers/misc/uacce/uacce.c
@@ -180,14 +180,6 @@ static int uacce_fops_release(struct inode *inode, struct file *filep)
        return 0;
 }
 
-static vm_fault_t uacce_vma_fault(struct vm_fault *vmf)
-{
-       if (vmf->flags & (FAULT_FLAG_MKWRITE | FAULT_FLAG_WRITE))
-               return VM_FAULT_SIGBUS;
-
-       return 0;
-}
-
 static void uacce_vma_close(struct vm_area_struct *vma)
 {
        struct uacce_queue *q = vma->vm_private_data;
@@ -200,7 +192,6 @@ static void uacce_vma_close(struct vm_area_struct *vma)
 }
 
 static const struct vm_operations_struct uacce_vm_ops = {
-       .fault = uacce_vma_fault,
        .close = uacce_vma_close,
 };