1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 42f7fa442ff8..6f954a808b65 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -46,7 +46,7 @@
 #include <linux/completion.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/slab.h>
 
 #include <asm/uaccess.h>
@@ -64,6 +64,7 @@
 #define VIOTAPE_KERN_WARN       KERN_WARNING "viotape: "
 #define VIOTAPE_KERN_INFO       KERN_INFO "viotape: "
 
+static DEFINE_MUTEX(proc_viotape_mutex);
 static int viotape_numdev;
 
 /*
@@ -684,9 +685,9 @@ static long viotap_unlocked_ioctl(struct file *file,
 {
         long rc;
 
-        lock_kernel();
+        mutex_lock(&proc_viotape_mutex);
         rc = viotap_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&proc_viotape_mutex);
         return rc;
 }
 
@@ -700,7 +701,7 @@ static int viotap_open(struct inode *inode, struct file *file)
         if (op == NULL)
                 return -ENOMEM;
 
-        lock_kernel();
+        mutex_lock(&proc_viotape_mutex);
         get_dev_info(file->f_path.dentry->d_inode, &devi);
 
         /* Note: We currently only support one mode! */
@@ -731,7 +732,7 @@ static int viotap_open(struct inode *inode, struct file *file)
 
 free_op:
         free_op_struct(op);
-        unlock_kernel();
+        mutex_unlock(&proc_viotape_mutex);
         return ret;
 }