4 files changed, 23 insertions, 17 deletions

diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index f6c1c5fd075d..fa1eceed0d23 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -30,7 +30,6 @@
 #include <linux/miscdevice.h>
 #include <linux/utsname.h>
 #include <linux/cpumask.h>
-#include <linux/smp_lock.h>
 #include <linux/nodemask.h>
 #include <linux/smp.h>
 #include <linux/mutex.h>
@@ -682,8 +681,7 @@ static int sn_hwperf_map_err(int hwperf_err)
 /*
  * ioctl for "sn_hwperf" misc device
  */
-static int
-sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
+static long sn_hwperf_ioctl(struct file *fp, u32 op, unsigned long arg)
 {
         struct sn_hwperf_ioctl_args a;
         struct cpuinfo_ia64 *cdata;
@@ -699,8 +697,6 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
         int i;
         int j;
 
-        unlock_kernel();
-
         /* only user requests are allowed here */
         if ((op & SN_HWPERF_OP_MASK) < 10) {
                 r = -EINVAL;
@@ -859,12 +855,11 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
 error:
         vfree(p);
 
-        lock_kernel();
         return r;
 }
 
 static const struct file_operations sn_hwperf_fops = {
-        .ioctl = sn_hwperf_ioctl,
+        .unlocked_ioctl = sn_hwperf_ioctl,
 };
 
 static struct miscdevice sn_hwperf_dev = {
diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index d332503fa1be..cfcac1ff4cf2 100644
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -124,8 +124,8 @@ static ssize_t harddog_write(struct file *file, const char __user *data, size_t
         return 0;
 }
 
-static int harddog_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg)
+static int harddog_ioctl_unlocked(struct file *file,
+                                  unsigned int cmd, unsigned long arg)
 {
         void __user *argp= (void __user *)arg;
         static struct watchdog_info ident = {
@@ -148,10 +148,22 @@ static int harddog_ioctl(struct inode *inode, struct file *file,
         }
 }
 
+static long harddog_ioctl(struct file *file,
+                          unsigned int cmd, unsigned long arg)
+{
+        long ret;
+
+        lock_kernel();
+        ret = harddog_ioctl_unlocked(file, cmd, arg);
+        unlock_kernel();
+
+        return ret;
+}
+
 static const struct file_operations harddog_fops = {
         .owner          = THIS_MODULE,
         .write          = harddog_write,
-        .ioctl          = harddog_ioctl,
+        .unlocked_ioctl = harddog_ioctl,
         .open           = harddog_open,
         .release        = harddog_release,
 };
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 368219cc2366..ae42695c3597 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -136,7 +136,7 @@ static unsigned int hostaudio_poll(struct file *file,
         return mask;
 }
 
-static int hostaudio_ioctl(struct inode *inode, struct file *file,
+static long hostaudio_ioctl(struct file *file,
                            unsigned int cmd, unsigned long arg)
 {
         struct hostaudio_state *state = file->private_data;
@@ -223,7 +223,7 @@ static int hostaudio_release(struct inode *inode, struct file *file)
 
 /* /dev/mixer file operations */
 
-static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
+static long hostmixer_ioctl_mixdev(struct file *file,
                                   unsigned int cmd, unsigned long arg)
 {
         struct hostmixer_state *state = file->private_data;
@@ -289,7 +289,7 @@ static const struct file_operations hostaudio_fops = {
         .read           = hostaudio_read,
         .write          = hostaudio_write,
         .poll           = hostaudio_poll,
-        .ioctl          = hostaudio_ioctl,
+        .unlocked_ioctl = hostaudio_ioctl,
         .mmap           = NULL,
         .open           = hostaudio_open,
         .release        = hostaudio_release,
@@ -298,7 +298,7 @@ static const struct file_operations hostaudio_fops = {
 static const struct file_operations hostmixer_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
-        .ioctl          = hostmixer_ioctl_mixdev,
+        .unlocked_ioctl = hostmixer_ioctl_mixdev,
         .open           = hostmixer_open_mixdev,
         .release        = hostmixer_release,
 };
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,