4 files changed, 41 insertions, 12 deletions

diff --git a/arch/mips/basler/excite/excite_iodev.c b/arch/mips/basler/excite/excite_iodev.c
index 476d20e08d0e..a1e3526b4a94 100644
--- a/arch/mips/basler/excite/excite_iodev.c
+++ b/arch/mips/basler/excite/excite_iodev.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
 
 #include "excite_iodev.h"
 
@@ -110,8 +111,14 @@ static int __exit iodev_remove(struct device *dev)
 
 static int iodev_open(struct inode *i, struct file *f)
 {
-        return request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,
+        int ret;
+
+        lock_kernel();
+        ret = request_irq(iodev_irq, iodev_irqhdl, IRQF_DISABLED,
                            iodev_name, &miscdev);
+        unlock_kernel();
+
+        return ret;
 }
 
 static int iodev_release(struct inode *i, struct file *f)
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index b88f1c18ff4d..b55641961232 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -28,6 +28,7 @@
 #include <linux/vmalloc.h>
 #include <linux/elf.h>
 #include <linux/seq_file.h>
+#include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/moduleloader.h>
 #include <linux/interrupt.h>
@@ -392,8 +393,12 @@ out:
 static int file_open(struct inode *inode, struct file *filp)
 {
         int minor = iminor(inode);
+        int err;
 
-        return rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1);
+        lock_kernel();
+        err = rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1);
+        unlock_kernel();
+        return err;
 }
 
 static int file_release(struct inode *inode, struct file *filp)
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 2794501ff302..972b2d2b8401 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -38,6 +38,7 @@
 #include <linux/vmalloc.h>
 #include <linux/elf.h>
 #include <linux/seq_file.h>
+#include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/moduleloader.h>
 #include <linux/interrupt.h>
@@ -1050,17 +1051,20 @@ static int vpe_open(struct inode *inode, struct file *filp)
         enum vpe_state state;
         struct vpe_notifications *not;
         struct vpe *v;
-        int ret;
+        int ret, err = 0;
 
+        lock_kernel();
         if (minor != iminor(inode)) {
                 /* assume only 1 device at the moment. */
                 printk(KERN_WARNING "VPE loader: only vpe1 is supported\n");
-                return -ENODEV;
+                err = -ENODEV;
+                goto out;
         }
 
         if ((v = get_vpe(tclimit)) == NULL) {
                 printk(KERN_WARNING "VPE loader: unable to get vpe\n");
-                return -ENODEV;
+                err = -ENODEV;
+                goto out;
         }
 
         state = xchg(&v->state, VPE_STATE_INUSE);
@@ -1100,6 +1104,8 @@ static int vpe_open(struct inode *inode, struct file *filp)
         v->shared_ptr = NULL;
         v->__start = 0;
 
+out:
+        unlock_kernel();
         return 0;
 }
 
diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c
index 63b444eaf01e..28b012ab8dcb 100644
--- a/arch/mips/sibyte/common/sb_tbprof.c
+++ b/arch/mips/sibyte/common/sb_tbprof.c
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/errno.h>
@@ -402,18 +403,26 @@ static int sbprof_zbprof_stop(void)
 static int sbprof_tb_open(struct inode *inode, struct file *filp)
 {
         int minor;
+        int err = 0;
 
+        lock_kernel();
         minor = iminor(inode);
-        if (minor != 0)
-                return -ENODEV;
+        if (minor != 0) {
+                err = -ENODEV;
+                goto out;
+        }
 
-        if (xchg(&sbp.open, SB_OPENING) != SB_CLOSED)
-                return -EBUSY;
+        if (xchg(&sbp.open, SB_OPENING) != SB_CLOSED) {
+                err = -EBUSY;
+                goto out;
+        }
 
         memset(&sbp, 0, sizeof(struct sbprof_tb));
         sbp.sbprof_tbbuf = vmalloc(MAX_TBSAMPLE_BYTES);
-        if (!sbp.sbprof_tbbuf)
-                return -ENOMEM;
+        if (!sbp.sbprof_tbbuf) {
+                err = -ENOMEM;
+                goto out;
+        }
         memset(sbp.sbprof_tbbuf, 0, MAX_TBSAMPLE_BYTES);
         init_waitqueue_head(&sbp.tb_sync);
         init_waitqueue_head(&sbp.tb_read);
@@ -421,7 +430,9 @@ static int sbprof_tb_open(struct inode *inode, struct file *filp)
 
         sbp.open = SB_OPEN;
 
-        return 0;
+  out:
+        unlock_kernel();
+        return err;
 }
 
 static int sbprof_tb_release(struct inode *inode, struct file *filp)