diff options
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 404f4c1ee431..0c80c68cd047 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -252,7 +252,6 @@ static void notify_update(struct vc_data *vc) | |||
252 | struct vt_notifier_param param = { .vc = vc }; | 252 | struct vt_notifier_param param = { .vc = vc }; |
253 | atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, ¶m); | 253 | atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, ¶m); |
254 | } | 254 | } |
255 | |||
256 | /* | 255 | /* |
257 | * Low-Level Functions | 256 | * Low-Level Functions |
258 | */ | 257 | */ |
@@ -935,6 +934,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc, | |||
935 | 934 | ||
936 | if (CON_IS_VISIBLE(vc)) | 935 | if (CON_IS_VISIBLE(vc)) |
937 | update_screen(vc); | 936 | update_screen(vc); |
937 | vt_event_post(VT_EVENT_RESIZE, vc->vc_num, vc->vc_num); | ||
938 | return err; | 938 | return err; |
939 | } | 939 | } |
940 | 940 | ||
@@ -2129,11 +2129,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co | |||
2129 | currcons = vc->vc_num; | 2129 | currcons = vc->vc_num; |
2130 | if (!vc_cons_allocated(currcons)) { | 2130 | if (!vc_cons_allocated(currcons)) { |
2131 | /* could this happen? */ | 2131 | /* could this happen? */ |
2132 | static int error = 0; | 2132 | printk_once("con_write: tty %d not allocated\n", currcons+1); |
2133 | if (!error) { | ||
2134 | error = 1; | ||
2135 | printk("con_write: tty %d not allocated\n", currcons+1); | ||
2136 | } | ||
2137 | release_console_sem(); | 2133 | release_console_sem(); |
2138 | return 0; | 2134 | return 0; |
2139 | } | 2135 | } |
@@ -2910,6 +2906,9 @@ static const struct tty_operations con_ops = { | |||
2910 | .flush_chars = con_flush_chars, | 2906 | .flush_chars = con_flush_chars, |
2911 | .chars_in_buffer = con_chars_in_buffer, | 2907 | .chars_in_buffer = con_chars_in_buffer, |
2912 | .ioctl = vt_ioctl, | 2908 | .ioctl = vt_ioctl, |
2909 | #ifdef CONFIG_COMPAT | ||
2910 | .compat_ioctl = vt_compat_ioctl, | ||
2911 | #endif | ||
2913 | .stop = con_stop, | 2912 | .stop = con_stop, |
2914 | .start = con_start, | 2913 | .start = con_start, |
2915 | .throttle = con_throttle, | 2914 | .throttle = con_throttle, |
@@ -2948,9 +2947,6 @@ int __init vty_init(const struct file_operations *console_fops) | |||
2948 | panic("Couldn't register console driver\n"); | 2947 | panic("Couldn't register console driver\n"); |
2949 | kbd_init(); | 2948 | kbd_init(); |
2950 | console_map_init(); | 2949 | console_map_init(); |
2951 | #ifdef CONFIG_PROM_CONSOLE | ||
2952 | prom_con_init(); | ||
2953 | #endif | ||
2954 | #ifdef CONFIG_MDA_CONSOLE | 2950 | #ifdef CONFIG_MDA_CONSOLE |
2955 | mda_console_init(); | 2951 | mda_console_init(); |
2956 | #endif | 2952 | #endif |
@@ -2958,7 +2954,6 @@ int __init vty_init(const struct file_operations *console_fops) | |||
2958 | } | 2954 | } |
2959 | 2955 | ||
2960 | #ifndef VT_SINGLE_DRIVER | 2956 | #ifndef VT_SINGLE_DRIVER |
2961 | #include <linux/device.h> | ||
2962 | 2957 | ||
2963 | static struct class *vtconsole_class; | 2958 | static struct class *vtconsole_class; |
2964 | 2959 | ||
@@ -3641,6 +3636,7 @@ void do_blank_screen(int entering_gfx) | |||
3641 | blank_state = blank_vesa_wait; | 3636 | blank_state = blank_vesa_wait; |
3642 | mod_timer(&console_timer, jiffies + vesa_off_interval); | 3637 | mod_timer(&console_timer, jiffies + vesa_off_interval); |
3643 | } | 3638 | } |
3639 | vt_event_post(VT_EVENT_BLANK, vc->vc_num, vc->vc_num); | ||
3644 | } | 3640 | } |
3645 | EXPORT_SYMBOL(do_blank_screen); | 3641 | EXPORT_SYMBOL(do_blank_screen); |
3646 | 3642 | ||
@@ -3685,6 +3681,7 @@ void do_unblank_screen(int leaving_gfx) | |||
3685 | console_blank_hook(0); | 3681 | console_blank_hook(0); |
3686 | set_palette(vc); | 3682 | set_palette(vc); |
3687 | set_cursor(vc); | 3683 | set_cursor(vc); |
3684 | vt_event_post(VT_EVENT_UNBLANK, vc->vc_num, vc->vc_num); | ||
3688 | } | 3685 | } |
3689 | EXPORT_SYMBOL(do_unblank_screen); | 3686 | EXPORT_SYMBOL(do_unblank_screen); |
3690 | 3687 | ||