diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-14 09:45:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-14 09:45:34 -0700 |
| commit | 1273eb89bc5681e563a1a3b55c72bb2aa7f4147c (patch) | |
| tree | f677290a33f4d11b24f9f34ec5ee6ab79ba629ec /tty | |
| parent | b8804021e71f5af9d5f8f4d3f08dd0cb64942d05 (diff) | |
| download | patches-1273eb89bc5681e563a1a3b55c72bb2aa7f4147c.tar.gz | |
more patches
Diffstat (limited to 'tty')
| -rw-r--r-- | tty/tty-includecheck-fix-drivers-char-vt.c.patch | 30 | ||||
| -rw-r--r-- | tty/vt-events | 36 |
2 files changed, 44 insertions, 22 deletions
diff --git a/tty/tty-includecheck-fix-drivers-char-vt.c.patch b/tty/tty-includecheck-fix-drivers-char-vt.c.patch new file mode 100644 index 00000000000000..e52bcc1261d462 --- /dev/null +++ b/tty/tty-includecheck-fix-drivers-char-vt.c.patch @@ -0,0 +1,30 @@ +From jaswinder@kernel.org Thu Aug 13 16:41:24 2009 +From: Jaswinder Singh Rajput <jaswinder@kernel.org> +Date: Thu, 13 Aug 2009 13:56:20 +0530 +Subject: tty: includecheck fix: drivers/char, vt.c +To: Andrew Morton <akpm@linux-foundation.org>, Alan Cox <alan@lxorguk.ukuu.org.uk>, Greg KH <greg@kroah.com> +Message-ID: <1250151980.6116.18.camel@ht.satnam> + +From: Jaswinder Singh Rajput <jaswinder@kernel.org> + +fix the following 'make includecheck' warning: + + drivers/char/vt.c: linux/device.h is included more than once. + +Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/char/vt.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/char/vt.c ++++ b/drivers/char/vt.c +@@ -2958,7 +2958,6 @@ int __init vty_init(const struct file_op + } + + #ifndef VT_SINGLE_DRIVER +-#include <linux/device.h> + + static struct class *vtconsole_class; + diff --git a/tty/vt-events b/tty/vt-events index c6205e20bc48c1..9a6e1285df463e 100644 --- a/tty/vt-events +++ b/tty/vt-events @@ -16,18 +16,16 @@ Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/char/vt.c | 4 + - drivers/char/vt_ioctl.c | 185 ++++++++++++++++++++++++++++++++++------------- - include/linux/vt.h | 14 ++++ - include/linux/vt_kern.h | 3 + + drivers/char/vt.c | 4 - + drivers/char/vt_ioctl.c | 185 +++++++++++++++++++++++++++++++++++------------- + include/linux/vt.h | 14 +++ + include/linux/vt_kern.h | 3 4 files changed, 154 insertions(+), 52 deletions(-) -diff --git a/drivers/char/vt.c b/drivers/char/vt.c -index 404f4c1..9a01270 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c -@@ -252,7 +252,6 @@ static void notify_update(struct vc_data *vc) +@@ -252,7 +252,6 @@ static void notify_update(struct vc_data struct vt_notifier_param param = { .vc = vc }; atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, ¶m); } @@ -35,7 +33,7 @@ index 404f4c1..9a01270 100644 /* * Low-Level Functions */ -@@ -935,6 +934,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc, +@@ -935,6 +934,7 @@ static int vc_do_resize(struct tty_struc if (CON_IS_VISIBLE(vc)) update_screen(vc); @@ -43,7 +41,7 @@ index 404f4c1..9a01270 100644 return err; } -@@ -3641,6 +3641,7 @@ void do_blank_screen(int entering_gfx) +@@ -3640,6 +3640,7 @@ void do_blank_screen(int entering_gfx) blank_state = blank_vesa_wait; mod_timer(&console_timer, jiffies + vesa_off_interval); } @@ -51,7 +49,7 @@ index 404f4c1..9a01270 100644 } EXPORT_SYMBOL(do_blank_screen); -@@ -3685,6 +3686,7 @@ void do_unblank_screen(int leaving_gfx) +@@ -3684,6 +3685,7 @@ void do_unblank_screen(int leaving_gfx) console_blank_hook(0); set_palette(vc); set_cursor(vc); @@ -59,11 +57,9 @@ index 404f4c1..9a01270 100644 } EXPORT_SYMBOL(do_unblank_screen); -diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c -index 95189f2..35ad94e 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c -@@ -62,6 +62,133 @@ extern struct tty_driver *console_driver; +@@ -62,6 +62,133 @@ extern struct tty_driver *console_driver static void complete_change_console(struct vc_data *vc); /* @@ -197,7 +193,7 @@ index 95189f2..35ad94e 100644 * these are the valid i/o ports we're allowed to change. they map all the * video ports */ -@@ -360,6 +487,8 @@ do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_ +@@ -360,6 +487,8 @@ do_unimap_ioctl(int cmd, struct unimapde return 0; } @@ -206,7 +202,7 @@ index 95189f2..35ad94e 100644 /* * We handle the console-specific ioctl's here. We allow the * capability to modify any console, not just the fg_console. -@@ -851,7 +980,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, +@@ -851,7 +980,7 @@ int vt_ioctl(struct tty_struct *tty, str if (arg == 0 || arg > MAX_NR_CONSOLES) ret = -ENXIO; else @@ -215,7 +211,7 @@ index 95189f2..35ad94e 100644 break; /* -@@ -1159,6 +1288,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, +@@ -1159,6 +1288,9 @@ int vt_ioctl(struct tty_struct *tty, str ret = put_user(vc->vc_hi_font_mask, (unsigned short __user *)arg); break; @@ -288,7 +284,7 @@ index 95189f2..35ad94e 100644 last_console = fg_console; -@@ -1325,7 +1410,7 @@ static void complete_change_console(struct vc_data *vc) +@@ -1325,7 +1410,7 @@ static void complete_change_console(stru /* * Wake anyone waiting for their VT to activate */ @@ -297,8 +293,6 @@ index 95189f2..35ad94e 100644 return; } -diff --git a/include/linux/vt.h b/include/linux/vt.h -index 02c1c02..89c03a1 100644 --- a/include/linux/vt.h +++ b/include/linux/vt.h @@ -74,4 +74,18 @@ struct vt_consize { @@ -320,11 +314,9 @@ index 02c1c02..89c03a1 100644 +#define VT_WAITEVENT 0x560E /* Wait for an event */ + #endif /* _LINUX_VT_H */ -diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h -index 2f11134..f8c797d 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h -@@ -91,7 +91,8 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc); +@@ -91,7 +91,8 @@ int con_copy_unimap(struct vc_data *dst_ #endif /* vt.c */ |