]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
vcs: BKL pushdown
authorJonathan Corbet <corbet@lwn.net>
Fri, 16 May 2008 19:47:50 +0000 (13:47 -0600)
committerJonathan Corbet <corbet@lwn.net>
Fri, 20 Jun 2008 20:05:51 +0000 (14:05 -0600)
Add explicit BKL to vcs_open().

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
drivers/char/vc_screen.c

index 83aeedda200cfccc6724be4eaf8ce3c715b1c2d7..eebfad2777d29ac9bfd7134eab259c11c7bd5a79 100644 (file)
@@ -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 = {