summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-04-27 16:24:23 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2010-05-17 05:27:03 +0200
commitd5f1d54cbc1b2f320ac054b2df519dec22a27779 (patch)
tree8ee3cd8caf54d774901e79f88156b41e37d7fe58
parentsn_hwperf: Kill BKL usage (diff)
downloadlinux-d5f1d54cbc1b2f320ac054b2df519dec22a27779.tar.xz
linux-d5f1d54cbc1b2f320ac054b2df519dec22a27779.zip
um/mmapper: Remove BKL usage
An empty function does not need the BKL, so just remove it. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
-rw-r--r--arch/um/drivers/mmapper_kern.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index d22f9e5c0eac..7158393b6793 100644
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -46,8 +46,7 @@ static ssize_t mmapper_write(struct file *file, const char __user *buf,
return count;
}
-static int mmapper_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long mmapper_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
return -ENOIOCTLCMD;
}
@@ -90,7 +89,7 @@ static const struct file_operations mmapper_fops = {
.owner = THIS_MODULE,
.read = mmapper_read,
.write = mmapper_write,
- .ioctl = mmapper_ioctl,
+ .unlocked_ioctl = mmapper_ioctl,
.mmap = mmapper_mmap,
.open = mmapper_open,
.release = mmapper_release,