diff options
| author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:47:54 +0100 |
|---|---|---|
| committer | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:47:54 +0100 |
| commit | f233851ed1cf861259e3ef3ae58e4bf9afe6040d (patch) | |
| tree | 298fe211f9e1801c5eb3f5d9bfed8ecc26ca777a | |
| parent | 1ccbbfdcf9d8e0ae6c15fc7c2ab5fffa63c190ca (diff) | |
| download | ldd3-f233851ed1cf861259e3ef3ae58e4bf9afe6040d.tar.gz | |
scullc: BKL ioctl pushdown API change
| -rw-r--r-- | scullc/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scullc/main.c b/scullc/main.c index 5769f1a..814db02 100644 --- a/scullc/main.c +++ b/scullc/main.c @@ -271,8 +271,7 @@ ssize_t scullc_write (struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int scullc_ioctl (struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +long scullc_ioctl (struct file *filp, unsigned int cmd, unsigned long arg) { int err = 0, ret = 0, tmp; @@ -475,7 +474,7 @@ struct file_operations scullc_fops = { .llseek = scullc_llseek, .read = scullc_read, .write = scullc_write, - .ioctl = scullc_ioctl, + .unlocked_ioctl = scullc_ioctl, .open = scullc_open, .release = scullc_release, .aio_read = scullc_aio_read, |