vc: Locking clean up

The virtual console layer uses the BKL for various things that don't really
need it. Clean them out.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index f97b9e8480645f85c34efb7bcbb41b3474e34d6c..6e79340d732f8e184de93cb918853ab4950ef452 100644 (file)
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -26,6 +26,7 @@
 #include <linux/selection.h>
 #include <linux/tiocl.h>
 #include <linux/console.h>
+#include <linux/smp_lock.h>
 
 /* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */
 #define isspace(c)     ((c) == ' ')
@@ -312,6 +313,8 @@ int paste_selection(struct tty_struct *tty)
        struct  tty_ldisc *ld;
        DECLARE_WAITQUEUE(wait, current);
 
+       lock_kernel();
+
        acquire_console_sem();
        poke_blanked_console();
        release_console_sem();
@@ -335,5 +338,6 @@ int paste_selection(struct tty_struct *tty)
        __set_current_state(TASK_RUNNING);
 
        tty_ldisc_deref(ld);
+       unlock_kernel();
        return 0;
 }

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 82f64ac211911624df4cba181535d216b9529738..9f67ad919a4ad775b29a0f3c5fc90415730635f9 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -287,8 +287,12 @@ static inline unsigned short *screenpos(struct vc_data *vc, int offset, int view
        return p;
 }
 
+/* Called  from the keyboard irq path.. */
 static inline void scrolldelta(int lines)
 {
+       /* FIXME */
+       /* scrolldelta needs some kind of consistency lock, but the BKL was
+          and still is not protecting versus the scheduled back end */
        scrollback_delta += lines;
        schedule_console_callback();
 }
@@ -2616,8 +2620,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                return -EFAULT;
        ret = 0;
 
-       lock_kernel();
-
        switch (type)
        {
                case TIOCL_SETSEL:
@@ -2692,7 +2694,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                        ret = -EINVAL;
                        break;
        }
-       unlock_kernel();
        return ret;
 }