Merge branch 'linus' into cpus4096

Conflicts:

	drivers/acpi/processor_throttling.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 17 insertions, 6 deletions

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 977f7d35e769..e5da98d8f9cd 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -678,6 +678,17 @@ free_op:
         return ret;
 }
 
+static long viotap_unlocked_ioctl(struct file *file,
+                unsigned int cmd, unsigned long arg)
+{
+        long rc;
+
+        lock_kernel();
+        rc = viotap_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
+        unlock_kernel();
+        return rc;
+}
+
 static int viotap_open(struct inode *inode, struct file *file)
 {
         HvLpEvent_Rc hvrc;
@@ -786,12 +797,12 @@ free_op:
 }
 
 const struct file_operations viotap_fops = {
-        .owner =        THIS_MODULE,
-        .read =         viotap_read,
-        .write =        viotap_write,
-        .ioctl =        viotap_ioctl,
-        .open =         viotap_open,
-        .release =      viotap_release,
+        .owner =                THIS_MODULE,
+        .read =                 viotap_read,
+        .write =                viotap_write,
+        .unlocked_ioctl =       viotap_unlocked_ioctl,
+        .open =                 viotap_open,
+        .release =              viotap_release,
 };
 
 /* Handle interrupt events for tape */