From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 16 May 2008 19:47:50 +0000 (-0600)
Subject: vcs: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~106
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f97259e35de1f99ba0ac19383408e247fd763cf0;p=linux-2.6

vcs: BKL pushdown

Add explicit BKL to vcs_open().

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 83aeedda20..eebfad2777 100644
--- a/drivers/char/vc_screen.c
+++ b/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 = {