diff options
12 files changed, 20 insertions, 20 deletions
diff --git a/tty/serial-crisv10-formatting-of-pointers-in-printk.patch b/tty/serial-crisv10-formatting-of-pointers-in-printk.patch index 39b33064f9d73b..7bc13392eda19b 100644 --- a/tty/serial-crisv10-formatting-of-pointers-in-printk.patch +++ b/tty/serial-crisv10-formatting-of-pointers-in-printk.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c -@@ -4522,8 +4522,8 @@ static int __init rs_init(void) +@@ -4533,8 +4533,8 @@ static int __init rs_init(void) INIT_WORK(&info->work, do_softint); if (info->enabled) { diff --git a/tty/serial-mmio32-support-for-8250_early.c.patch b/tty/serial-mmio32-support-for-8250_early.c.patch index 818bf9f1a875db..eaf3e6f4fa2fe6 100644 --- a/tty/serial-mmio32-support-for-8250_early.c.patch +++ b/tty/serial-mmio32-support-for-8250_early.c.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -688,8 +688,11 @@ and is between 256 and 4096 characters. +@@ -681,8 +681,11 @@ and is between 256 and 4096 characters. earlycon= [KNL] Output early console device and options. uart[8250],io,<addr>[,options] uart[8250],mmio,<addr>[,options] diff --git a/tty/tty-add-extproc-support-for-linemode.patch b/tty/tty-add-extproc-support-for-linemode.patch index 3ca0ab0112b060..f641375220a820 100644 --- a/tty/tty-add-extproc-support-for-linemode.patch +++ b/tty/tty-add-extproc-support-for-linemode.patch @@ -184,7 +184,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 -@@ -84,6 +85,7 @@ +@@ -85,6 +86,7 @@ #define TIOCPKT_START 8 #define TIOCPKT_NOSTOP 16 #define TIOCPKT_DOSTOP 32 diff --git a/tty/tty-introduce-wait_event_interruptible_tty.patch b/tty/tty-introduce-wait_event_interruptible_tty.patch index 45b86edc31debb..25569695719b31 100644 --- a/tty/tty-introduce-wait_event_interruptible_tty.patch +++ b/tty/tty-introduce-wait_event_interruptible_tty.patch @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c -@@ -3981,7 +3981,7 @@ block_til_ready(struct tty_struct *tty, +@@ -3992,7 +3992,7 @@ block_til_ready(struct tty_struct *tty, */ if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) { @@ -144,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> !(info->flags & ASYNC_CLOSING)); #ifdef SERIAL_DO_RESTART if (info->flags & ASYNC_HUP_NOTIFY) -@@ -4139,7 +4139,7 @@ rs_open(struct tty_struct *tty, struct f +@@ -4150,7 +4150,7 @@ rs_open(struct tty_struct *tty, struct f */ if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) { diff --git a/tty/tty-make-vt-s-have-a-tty_port.patch b/tty/tty-make-vt-s-have-a-tty_port.patch index 02c92b34479340..9513b4d8410036 100644 --- a/tty/tty-make-vt-s-have-a-tty_port.patch +++ b/tty/tty-make-vt-s-have-a-tty_port.patch @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); visual_init(vc, currcons, 1); if (!*vc->vc_uni_pagedir_loc) -@@ -2920,6 +2921,7 @@ static int __init con_init(void) +@@ -2921,6 +2922,7 @@ static int __init con_init(void) for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) { vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT); INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); diff --git a/tty/tty-move-the-vt_tty-field-from-the-vc_data-into-the-standard-tty_port.patch b/tty/tty-move-the-vt_tty-field-from-the-vc_data-into-the-standard-tty_port.patch index e0d26b9195d5e9..ffbfd6a79839d3 100644 --- a/tty/tty-move-the-vt_tty-field-from-the-vc_data-into-the-standard-tty_port.patch +++ b/tty/tty-move-the-vt_tty-field-from-the-vc_data-into-the-standard-tty_port.patch @@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* No driver data? Strange. Okay we fix it then. */ --- a/drivers/char/vt.c +++ b/drivers/char/vt.c -@@ -972,12 +972,12 @@ static int vc_do_resize(struct tty_struc +@@ -973,12 +973,12 @@ static int vc_do_resize(struct tty_struc * Resize a virtual console as seen from the console end of things. We * use the common vc_do_resize methods to update the structures. The * caller must hold the console sem to protect console internals and @@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -2806,12 +2806,12 @@ static int con_open(struct tty_struct *t +@@ -2807,12 +2807,12 @@ static int con_open(struct tty_struct *t struct vc_data *vc = vc_cons[currcons].d; /* Still being freed */ @@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!tty->winsize.ws_row && !tty->winsize.ws_col) { tty->winsize.ws_row = vc_cons[currcons].d->vc_rows; -@@ -2839,7 +2839,7 @@ static void con_shutdown(struct tty_stru +@@ -2840,7 +2840,7 @@ static void con_shutdown(struct tty_stru struct vc_data *vc = tty->driver_data; BUG_ON(vc == NULL); acquire_console_sem(); diff --git a/tty/tty-release-btm-while-sleeping-in-block_til_ready.patch b/tty/tty-release-btm-while-sleeping-in-block_til_ready.patch index 6d7656ab1da5ad..a915dd07f15083 100644 --- a/tty/tty-release-btm-while-sleeping-in-block_til_ready.patch +++ b/tty/tty-release-btm-while-sleeping-in-block_til_ready.patch @@ -163,7 +163,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> remove_wait_queue(&info->open_wait, &wait); --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c -@@ -4055,7 +4055,9 @@ block_til_ready(struct tty_struct *tty, +@@ -4066,7 +4066,9 @@ block_til_ready(struct tty_struct *tty, printk("block_til_ready blocking: ttyS%d, count = %d\n", info->line, info->count); #endif diff --git a/tty/tty-replace-bkl-with-a-new-tty_lock.patch b/tty/tty-replace-bkl-with-a-new-tty_lock.patch index 20228d048eb191..e685d85b072dbb 100644 --- a/tty/tty-replace-bkl-with-a-new-tty_lock.patch +++ b/tty/tty-replace-bkl-with-a-new-tty_lock.patch @@ -908,7 +908,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c -@@ -3924,7 +3924,7 @@ static void rs_wait_until_sent(struct tt +@@ -3935,7 +3935,7 @@ static void rs_wait_until_sent(struct tt * Check R_DMA_CHx_STATUS bit 0-6=number of available bytes in FIFO * R_DMA_CHx_HWSW bit 31-16=nbr of bytes left in DMA buffer (0=64k) */ @@ -917,7 +917,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> orig_jiffies = jiffies; while (info->xmit.head != info->xmit.tail || /* More in send queue */ (*info->ostatusadr & 0x007f) || /* more in FIFO */ -@@ -3941,7 +3941,7 @@ static void rs_wait_until_sent(struct tt +@@ -3952,7 +3952,7 @@ static void rs_wait_until_sent(struct tt curr_time_usec - info->last_tx_active_usec; } set_current_state(TASK_RUNNING); diff --git a/tty/tty-untangle-locking-of-wait_until_sent.patch b/tty/tty-untangle-locking-of-wait_until_sent.patch index da72b6ed9d6e02..88683fc7d15dc1 100644 --- a/tty/tty-untangle-locking-of-wait_until_sent.patch +++ b/tty/tty-untangle-locking-of-wait_until_sent.patch @@ -83,7 +83,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c -@@ -3924,7 +3924,6 @@ static void rs_wait_until_sent(struct tt +@@ -3935,7 +3935,6 @@ static void rs_wait_until_sent(struct tt * Check R_DMA_CHx_STATUS bit 0-6=number of available bytes in FIFO * R_DMA_CHx_HWSW bit 31-16=nbr of bytes left in DMA buffer (0=64k) */ @@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> orig_jiffies = jiffies; while (info->xmit.head != info->xmit.tail || /* More in send queue */ (*info->ostatusadr & 0x007f) || /* more in FIFO */ -@@ -3941,7 +3940,6 @@ static void rs_wait_until_sent(struct tt +@@ -3952,7 +3951,6 @@ static void rs_wait_until_sent(struct tt curr_time_usec - info->last_tx_active_usec; } set_current_state(TASK_RUNNING); diff --git a/tty/vc-locking-clean-up.patch b/tty/vc-locking-clean-up.patch index 723cda5a30002f..584979a0500692 100644 --- a/tty/vc-locking-clean-up.patch +++ b/tty/vc-locking-clean-up.patch @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> scrollback_delta += lines; schedule_console_callback(); } -@@ -2615,8 +2619,6 @@ int tioclinux(struct tty_struct *tty, un +@@ -2616,8 +2620,6 @@ int tioclinux(struct tty_struct *tty, un return -EFAULT; ret = 0; @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> switch (type) { case TIOCL_SETSEL: -@@ -2691,7 +2693,6 @@ int tioclinux(struct tty_struct *tty, un +@@ -2692,7 +2694,6 @@ int tioclinux(struct tty_struct *tty, un ret = -EINVAL; break; } diff --git a/tty/vt-clean-up-the-code-use-kernel-library.patch b/tty/vt-clean-up-the-code-use-kernel-library.patch index 6937d9cc1ffd20..65d7e12e50d039 100644 --- a/tty/vt-clean-up-the-code-use-kernel-library.patch +++ b/tty/vt-clean-up-the-code-use-kernel-library.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define MAX_NR_CON_DRIVER 16 -@@ -1795,8 +1796,8 @@ static void do_con_trol(struct tty_struc +@@ -1796,8 +1797,8 @@ static void do_con_trol(struct tty_struc vc->vc_state = ESnormal; return; case ESpalette: diff --git a/tty/vt-console-try-harder-to-print-output-when-panicing.patch b/tty/vt-console-try-harder-to-print-output-when-panicing.patch index b962db5e8dcf34..121c301fd00787 100644 --- a/tty/vt-console-try-harder-to-print-output-when-panicing.patch +++ b/tty/vt-console-try-harder-to-print-output-when-panicing.patch @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> vc->vc_sw->con_init(vc, init); if (!vc->vc_complement_mask) vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800; -@@ -2505,7 +2509,7 @@ static void vt_console_print(struct cons +@@ -2506,7 +2510,7 @@ static void vt_console_print(struct cons goto quit; } @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto quit; /* undraw cursor first */ -@@ -3782,7 +3786,8 @@ void do_unblank_screen(int leaving_gfx) +@@ -3784,7 +3788,8 @@ void do_unblank_screen(int leaving_gfx) return; } vc = vc_cons[fg_console].d; @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; /* but leave console_blanked != 0 */ if (blankinterval) { -@@ -3791,7 +3796,7 @@ void do_unblank_screen(int leaving_gfx) +@@ -3793,7 +3798,7 @@ void do_unblank_screen(int leaving_gfx) } console_blanked = 0; |
