[PATCH 04/13] [blackfin] changed ioctls to unlocked

stoyboyker
2009-03-24T21:14:43Z

From: Stoyan Gaydarov <stoyboyker@gmail.com>

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
arch/blackfin/mach-bf561/coreb.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/blackfin/mach-bf561/coreb.c b/arch/blackfin/mach-bf561/coreb.c
index 8598098..9ad89af 100644
--- a/arch/blackfin/mach-bf561/coreb.c
+++ b/arch/blackfin/mach-bf561/coreb.c
@@ -220,9 +220,10 @@ static int coreb_release(struct inode *inode, struct file *file)
return 0;
}

-static int coreb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long coreb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
+ lock_kernel();
+
int retval = 0;
int coreb_index = 0;

@@ -289,6 +290,7 @@ static int coreb_ioctl(struct inode *inode, struct file *file,
#endif
}

+ unlock_kernel();
return retval;
}

@@ -297,7 +299,7 @@ static struct file_operations coreb_fops = {
.llseek = coreb_lseek,
.read = coreb_read,
.write = coreb_write,
- .ioctl = coreb_ioctl,
+ .unlocked_ioctl = coreb_ioctl,
.open = coreb_open,
.release = coreb_release
};
--
1.6.2