diff options
| author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:02:56 +0100 |
|---|---|---|
| committer | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-01-03 14:02:56 +0100 |
| commit | ccd3e1cc6a94d540759e9a1e6973abbd0f20da2a (patch) | |
| tree | f23383d6da47e1c923763e2ff5e33b697ae511a3 /scull/main.c | |
| parent | a935346fdc09d5ab442f9375e0674e92ad7d2965 (diff) | |
| download | ldd3-ccd3e1cc6a94d540759e9a1e6973abbd0f20da2a.tar.gz | |
scull: BKL ioctl pushdown API change and use sema_init() instead init_MUTEX()
Diffstat (limited to 'scull/main.c')
| -rw-r--r-- | scull/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scull/main.c b/scull/main.c index ab3feb3..1bf14a7 100644 --- a/scull/main.c +++ b/scull/main.c @@ -389,8 +389,8 @@ ssize_t scull_write(struct file *filp, const char __user *buf, size_t count, * The ioctl() implementation */ -int scull_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +int scull_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg) { int err = 0, tmp; @@ -552,7 +552,7 @@ struct file_operations scull_fops = { .llseek = scull_llseek, .read = scull_read, .write = scull_write, - .ioctl = scull_ioctl, + .unlocked_ioctl = scull_ioctl, .open = scull_open, .release = scull_release, }; @@ -648,7 +648,7 @@ int scull_init_module(void) for (i = 0; i < scull_nr_devs; i++) { scull_devices[i].quantum = scull_quantum; scull_devices[i].qset = scull_qset; - init_MUTEX(&scull_devices[i].sem); + sema_init(&scull_devices[i].sem, 1); scull_setup_cdev(&scull_devices[i], i); } |