From 2e1ee9a9ae136e6686c88d9de9e7d9e3b83ff0ad Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 3 Jan 2011 14:52:53 +0100 Subject: scullv: BKL ioctl pushdown API change --- scullv/main.c | 5 ++--- 1 file 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, -- cgit v1.2.1-18-gbd029