From 86a848d50f2528da86a821672f027e7390e61ca5 Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 16 May 2008 13:47:50 -0600
Subject: [PATCH] --- yaml --- r: 100303 b: refs/heads/master c:
 f97259e35de1f99ba0ac19383408e247fd763cf0 h: refs/heads/master i:   100301:
 f0fd5665e5ea5b5c6a1b39511629fdf4e73090ee   100299:
 26d3e0d9b1c3b760df8d97d3e039fee007c29633   100295:
 1250fcf367ee85ee777b391fe65ab9ea7ceaa251   100287:
 4c3e5c4ea9938fde7eb120ee67b454e1c0cb0b3a v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/vc_screen.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 398f067baa56..ce3bb08ee98c 100644
--- 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
index 83aeedda200c..eebfad2777d2 100644
--- 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 = {