diff options
| author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:52:53 +0100 |
|---|---|---|
| committer | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:52:53 +0100 |
| commit | a1d85c9227812c0715020d52bbaf042311675b0a (patch) | |
| tree | 30d1b0f27087f5dd770ced5a074635c7c61d18cc | |
| parent | 29f5aec11c2c41ae6c8873a70aa5fe00ba5c36b3 (diff) | |
| download | ldd3-a1d85c9227812c0715020d52bbaf042311675b0a.tar.gz | |
scullv: BKL ioctl pushdown API change
| -rw-r--r-- | scullv/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scullv/main.c b/scullv/main.c index 6666857..df1a6fa 100644 --- a/scullv/main.c +++ b/scullv/main.c @@ -270,8 +270,7 @@ ssize_t scullv_write (struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int scullv_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +long scullv_ioctl (struct file *filp, unsigned int cmd, unsigned long arg) { int err = 0, ret = 0, tmp; @@ -479,7 +478,7 @@ struct file_operations scullv_fops = { .llseek = scullv_llseek, .read = scullv_read, .write = scullv_write, - .ioctl = scullv_ioctl, + .unlocked_ioctl = scullv_ioctl, .mmap = scullv_mmap, .open = scullv_open, .release = scullv_release, |