---

yaml --- r: 100303 b: refs/heads/master c: f97259e h: refs/heads/master i: 100301: f0fd566 100299: 26d3e0d 100295: 1250fcf 100287: 4c3e5c4 v: v3
git-mirror · Jun 20, 2008 · 86a848d · 86a848d
1 parent 40f584e
commit 86a848d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 609f9e92b570f390a457a81effe0af6b758dc582
+refs/heads/master: f97259e35de1f99ba0ac19383408e247fd763cf0
diff --git a/trunk/drivers/char/vc_screen.c b/trunk/drivers/char/vc_screen.c
@@ -34,6 +34,7 @@
 #include <linux/kbd_kern.h>
 #include <linux/console.h>
 #include <linux/device.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -460,9 +461,13 @@ static int
 vcs_open(struct inode *inode, struct file *filp)
 {
 	unsigned int currcons = iminor(inode) & 127;
+	int ret = 0;
+
+	lock_kernel();
 	if(currcons && !vc_cons_allocated(currcons-1))
-		return -ENXIO;
-	return 0;
+		ret = -ENXIO;
+	unlock_kernel();
+	return ret;
 }
 
 static const struct file_operations vcs_fops = {