Merge branch 'master' into tk71

[mv-sheeva.git] / arch / cris / arch-v32 / drivers / cryptocop.c

diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c
index b07646a30509680b0ad31c3d3c288de7d78107c8..c03bc3bc30c2f581f1dce2a4783fcf570d81ab6c 100644 (file)
--- a/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/arch/cris/arch-v32/drivers/cryptocop.c
@@ -281,7 +281,8 @@ const struct file_operations cryptocop_fops = {
        .owner          = THIS_MODULE,
        .open           = cryptocop_open,
        .release        = cryptocop_release,
-       .unlocked_ioctl = cryptocop_ioctl
+       .unlocked_ioctl = cryptocop_ioctl,
+       .llseek         = noop_llseek,
 };
 
 
@@ -3139,9 +3140,9 @@ cryptocop_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        struct inode *inode = file->f_path.dentry->d_inode;
        long ret;
 
-       lock_kernel();
+       mutex_lock(&cryptocop_mutex);
        ret = cryptocop_ioctl_unlocked(inode, filp, cmd, arg);
-       unlock_kernel();
+       mutex_unlock(&cryptocop_mutex);
 
        return ret;
 }