diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 00:28:25 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-25 00:28:25 +0200 |
| commit | d9c91873ac6dee10aeb7e165dee3aefc5f79bba8 (patch) | |
| tree | 55cd455c5b6b8cc3a532a36bcd21b135425afda5 /cryptodev_main.c | |
| parent | cc60983067194a6e7bdc12c7771aeaff6762a253 (diff) | |
| parent | 1ba66cab0563708d551e3462c249f1da21695882 (diff) | |
| download | kernel-crypto-d9c91873ac6dee10aeb7e165dee3aefc5f79bba8.tar.gz kernel-crypto-d9c91873ac6dee10aeb7e165dee3aefc5f79bba8.tar.xz kernel-crypto-d9c91873ac6dee10aeb7e165dee3aefc5f79bba8.zip | |
Merge branch 'bugfixes' into nlattr
Conflicts:
cryptodev_main.c
examples/ncr.c
examples/pk.c
ncr-int.h
ncr-key-wrap.c
ncr-key.c
ncr.c
ncr.h
Diffstat (limited to 'cryptodev_main.c')
| -rw-r--r-- | cryptodev_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c index 9c484f5259d..2a11fdb1258 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -127,9 +127,8 @@ cryptodev_release(struct inode *inode, struct file *filp) return 0; } -static int -cryptodev_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +static long +cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { void *ncr = filp->private_data; @@ -159,7 +158,7 @@ static const struct file_operations cryptodev_fops = { .owner = THIS_MODULE, .open = cryptodev_open, .release = cryptodev_release, - .ioctl = cryptodev_ioctl, + .unlocked_ioctl = cryptodev_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = cryptodev_compat_ioctl, #endif /* CONFIG_COMPAT */ |