diff options
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 82f64ac21191..9f67ad919a4a 100644 --- 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 | |||
287 | return p; | 287 | return p; |
288 | } | 288 | } |
289 | 289 | ||
290 | /* Called from the keyboard irq path.. */ | ||
290 | static inline void scrolldelta(int lines) | 291 | static inline void scrolldelta(int lines) |
291 | { | 292 | { |
293 | /* FIXME */ | ||
294 | /* scrolldelta needs some kind of consistency lock, but the BKL was | ||
295 | and still is not protecting versus the scheduled back end */ | ||
292 | scrollback_delta += lines; | 296 | scrollback_delta += lines; |
293 | schedule_console_callback(); | 297 | schedule_console_callback(); |
294 | } | 298 | } |
@@ -2616,8 +2620,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) | |||
2616 | return -EFAULT; | 2620 | return -EFAULT; |
2617 | ret = 0; | 2621 | ret = 0; |
2618 | 2622 | ||
2619 | lock_kernel(); | ||
2620 | |||
2621 | switch (type) | 2623 | switch (type) |
2622 | { | 2624 | { |
2623 | case TIOCL_SETSEL: | 2625 | case TIOCL_SETSEL: |
@@ -2692,7 +2694,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg) | |||
2692 | ret = -EINVAL; | 2694 | ret = -EINVAL; |
2693 | break; | 2695 | break; |
2694 | } | 2696 | } |
2695 | unlock_kernel(); | ||
2696 | return ret; | 2697 | return ret; |
2697 | } | 2698 | } |
2698 | 2699 | ||