---

yaml --- r: 100363 b: refs/heads/master c: 6ce46a4 h: refs/heads/master i: 100361: b5f7746 100359: e337e9d v: v3
git-mirror · Jul 2, 2008 · b5baf96 · b5baf96
1 parent 1a930a9
commit b5baf96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77149367dade50af8370420265bd4f818cde8afd
+refs/heads/master: 6ce46a435a3ac9e706d09a3075cbc60ed72d37db
diff --git a/trunk/drivers/s390/char/monreader.c b/trunk/drivers/s390/char/monreader.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -340,6 +341,7 @@ static int mon_open(struct inode *inode, struct file *filp)
 	/*
 	 * only one user allowed
 	 */
+	lock_kernel();
 	rc = -EBUSY;
 	if (test_and_set_bit(MON_IN_USE, &mon_in_use))
 		goto out;
@@ -377,6 +379,7 @@ static int mon_open(struct inode *inode, struct file *filp)
 	}
 	P_INFO("open, established connection to *MONITOR service\n\n");
 	filp->private_data = monpriv;
+	unlock_kernel();
 	return nonseekable_open(inode, filp);
 
 out_path:
@@ -386,6 +389,7 @@ static int mon_open(struct inode *inode, struct file *filp)
 out_use:
 	clear_bit(MON_IN_USE, &mon_in_use);
 out:
+	unlock_kernel();
 	return rc;
 }