ia64/perfmon: Convert to unlocked_ioctl

The ioctl function in this driver does not
do anything that requires the BKL, so make
it use unlocked_ioctl.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ab985f785c140830d1a9b781685696f93ac8909a..744329072f33be00a50e616d66bd2a11c3689f93 100644 (file)
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1696,8 +1696,8 @@ pfm_poll(struct file *filp, poll_table * wait)
        return mask;
 }
 
-static int
-pfm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long
+pfm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        DPRINT(("pfm_ioctl called\n"));
        return -EINVAL;
@@ -2174,15 +2174,15 @@ pfm_no_open(struct inode *irrelevant, struct file *dontcare)
 
 
 static const struct file_operations pfm_file_ops = {
-       .llseek   = no_llseek,
-       .read     = pfm_read,
-       .write    = pfm_write,
-       .poll     = pfm_poll,
-       .ioctl    = pfm_ioctl,
-       .open     = pfm_no_open,        /* special open code to disallow open via /proc */
-       .fasync   = pfm_fasync,
-       .release  = pfm_close,
-       .flush    = pfm_flush
+       .llseek         = no_llseek,
+       .read           = pfm_read,
+       .write          = pfm_write,
+       .poll           = pfm_poll,
+       .unlocked_ioctl = pfm_ioctl,
+       .open           = pfm_no_open,  /* special open code to disallow open via /proc */
+       .fasync         = pfm_fasync,
+       .release        = pfm_close,
+       .flush          = pfm_flush
 };
 
 static int