diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-07 17:33:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-07 17:33:15 -0700 |
| commit | 60235e074196a072b9c7d25fd07c380df42cb20c (patch) | |
| tree | ac6d265626dd13398187f928464ba3d4878ef96a /tty.current | |
| parent | fc53d51589bb1bfe9933fbb7de390c410c0ed927 (diff) | |
| download | patches-60235e074196a072b9c7d25fd07c380df42cb20c.tar.gz | |
remove patches now in Linus's tree
Diffstat (limited to 'tty.current')
5 files changed, 0 insertions, 235 deletions
diff --git a/tty.current/maintainers-orphan-isicom.patch b/tty.current/maintainers-orphan-isicom.patch deleted file mode 100644 index c8e416d42dd640..00000000000000 --- a/tty.current/maintainers-orphan-isicom.patch +++ /dev/null @@ -1,30 +0,0 @@ -From jirislaby@gmail.com Wed Sep 1 12:57:23 2010 -From: Jiri Slaby <jslaby@suse.cz> -To: gregkh@suse.de -Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com, - joe@perches.com -Subject: MAINTAINERS: orphan isicom -Date: Tue, 31 Aug 2010 17:08:52 +0200 -Message-Id: <1283267332-20879-1-git-send-email-jslaby@suse.cz> - -I do not maintain isicom anymore... - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - MAINTAINERS | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -3923,8 +3923,7 @@ F: Documentation/sound/oss/MultiSound - F: sound/oss/msnd* - - MULTITECH MULTIPORT CARD (ISICOM) --M: Jiri Slaby <jirislaby@gmail.com> --S: Maintained -+S: Orphan - F: drivers/char/isicom.c - F: include/linux/isicom.h - diff --git a/tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch b/tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch deleted file mode 100644 index 41156e15e89731..00000000000000 --- a/tty.current/serial-bfin_sport_uart-restore-transmit-frame-sync-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From vapier@gentoo.org Wed Sep 1 13:01:10 2010 -From: Sonic Zhang <sonic.zhang@analog.com> -To: linux-serial@vger.kernel.org, - Greg Kroah-Hartman <gregkh@suse.de>, - Alan Cox <alan@lxorguk.ukuu.org.uk> -Cc: uclinux-dist-devel@blackfin.uclinux.org, - linux-kernel@vger.kernel.org, Sonic Zhang <sonic.zhang@analog.com> -Subject: serial: bfin_sport_uart: restore transmit frame sync fix -Date: Sat, 28 Aug 2010 16:32:55 -0400 -Message-Id: <1283027575-1686-1-git-send-email-vapier@gentoo.org> - -From: Sonic Zhang <sonic.zhang@analog.com> - -The large cleanup/rewrite of resources in commit ccf68e59e93181df9353c0cc -accidentally reverted an earlier fix in commit a19e8b205915b2925aca75b. -So restore it here. - -Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Cc: stable <stable@kernel.org> [.34 and newer] -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/serial/bfin_sport_uart.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/serial/bfin_sport_uart.c -+++ b/drivers/serial/bfin_sport_uart.c -@@ -121,7 +121,7 @@ static int sport_uart_setup(struct sport - unsigned int sclk = get_sclk(); - - /* Set TCR1 and TCR2, TFSR is not enabled for uart */ -- SPORT_PUT_TCR1(up, (ITFS | TLSBIT | ITCLK)); -+ SPORT_PUT_TCR1(up, (LATFS | ITFS | TFSR | TLSBIT | ITCLK)); - SPORT_PUT_TCR2(up, size + 1); - pr_debug("%s TCR1:%x, TCR2:%x\n", __func__, SPORT_GET_TCR1(up), SPORT_GET_TCR2(up)); - diff --git a/tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch b/tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch deleted file mode 100644 index dac19b6c8c3f07..00000000000000 --- a/tty.current/serial-fix-port-type-conflict-between-ns16550a-u6_16550a.patch +++ /dev/null @@ -1,45 +0,0 @@ -From philippe.langlais@stericsson.com Wed Sep 1 12:57:48 2010 -From: Philippe Langlais <philippe.langlais@stericsson.com> -To: <gregkh@suse.de> -Cc: <linux@treblig.org>, <STEricsson_nomadik_linux@list.st.com>, - <loic.pallardy@stericsson.com>, <vincent.guittot@stericsson.com>, - Philippe Langlais <philippe.langlais@stericsson.com> -Subject: serial: fix port type conflict between NS16550A & U6_16550A -Date: Tue, 31 Aug 2010 14:19:09 +0200 -Message-ID: <1283257149-3370-1-git-send-email-philippe.langlais@stericsson.com> - -Bug seen by Dr. David Alan Gilbert with sparse - -Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/serial.h | 3 +-- - include/linux/serial_core.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/include/linux/serial.h -+++ b/include/linux/serial.h -@@ -77,8 +77,7 @@ struct serial_struct { - #define PORT_16654 11 - #define PORT_16850 12 - #define PORT_RSA 13 /* RSA-DV II/S card */ --#define PORT_U6_16550A 14 --#define PORT_MAX 14 -+#define PORT_MAX 13 - - #define SERIAL_IO_PORT 0 - #define SERIAL_IO_HUB6 1 ---- a/include/linux/serial_core.h -+++ b/include/linux/serial_core.h -@@ -44,7 +44,8 @@ - #define PORT_RM9000 16 /* PMC-Sierra RM9xxx internal UART */ - #define PORT_OCTEON 17 /* Cavium OCTEON internal UART */ - #define PORT_AR7 18 /* Texas Instruments AR7 internal UART */ --#define PORT_MAX_8250 18 /* max port ID */ -+#define PORT_U6_16550A 19 /* ST-Ericsson U6xxx internal UART */ -+#define PORT_MAX_8250 19 /* max port ID */ - - /* - * ARM specific type numbers. These are not currently guaranteed diff --git a/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch b/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch deleted file mode 100644 index a78df7ba8772a7..00000000000000 --- a/tty.current/tty-fix-tty_line-must-not-be-equal-to-number-of-allocated-tty-pointers-in-tty-driver.patch +++ /dev/null @@ -1,44 +0,0 @@ -From nathael.pajani@ed3l.fr Thu Sep 2 13:03:44 2010 -Message-ID: <4C7FAF58.9030700@ed3l.fr> -Date: Thu, 02 Sep 2010 16:06:16 +0200 -From: Nathael Pajani <nathael.pajani@ed3l.fr> -To: gregkh@suse.de, linux-kernel@vger.kernel.org -Cc: <torvalds@linux-foundation.org> -Subject: tty: fix tty_line must not be equal to number of allocated tty pointers in tty driver - -I found a bug "by chance" in drivers/char/tty_io.c - -I mean "by chance" because I was just reading the code of the -tty_find_polling_driver() to make a new tty_find_by_name() function. - -In tty_find_polling_driver() the driver actually test "tty_line <= -p->num" while num refers to the number of struct tty_struct pointers -allocated for the p->ttys (p is a tty_driver), and tty_line is scanned -in a tty name, which can be for example ttyS2. Then tty_line equals 2. -And if p->num is 2, we have only p->ttys[0] and p->ttys[1], but no -p->ttys[2]. - -This is actually unharmful, for tty_find_polling_driver() is used only -in drivers/serial/kgdboc.c, and there's a test over there to find a -console with a matching index, which will never happen. - -This is still a bug anyway. - -Signed-off-by: Nathael Pajani <nathael.pajani@ed3l.fr> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/tty_io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/char/tty_io.c -+++ b/drivers/char/tty_io.c -@@ -355,7 +355,7 @@ struct tty_driver *tty_find_polling_driv - if (*stp == '\0') - stp = NULL; - -- if (tty_line >= 0 && tty_line <= p->num && p->ops && -+ if (tty_line >= 0 && tty_line < p->num && p->ops && - p->ops->poll_init && !p->ops->poll_init(p, tty_line, stp)) { - res = tty_driver_kref_get(p); - *line = tty_line; diff --git a/tty.current/vt-fix-console-corruption-on-driver-hand-over.patch b/tty.current/vt-fix-console-corruption-on-driver-hand-over.patch deleted file mode 100644 index ce1dbd4b9e6f7f..00000000000000 --- a/tty.current/vt-fix-console-corruption-on-driver-hand-over.patch +++ /dev/null @@ -1,79 +0,0 @@ -From currojerez@riseup.net Wed Sep 1 12:47:54 2010 -From: Francisco Jerez <currojerez@riseup.net> -To: linux-kernel@vger.kernel.org -Cc: qiaochong <qiaochong@loongson.cn>, - Greg Kroah-Hartman <gregkh@suse.de>, - Andrew Morton <akpm@linux-foundation.org>, - Alan Cox <alan@linux.intel.com> -Subject: vt: Fix console corruption on driver hand-over. -Date: Sun, 22 Aug 2010 17:37:24 +0200 -Message-Id: <1282491444-25364-1-git-send-email-currojerez@riseup.net> - -After 02f0777a0d6560eb995aade34a1b82f95c0452da "vc_origin" is no -longer reset to the screen buffer before calling the con_init() hook -of the new console driver. - -If the old driver wasn't using a fixed scanout buffer (e.g. the case -of vgacon) "vc_origin" may be a pointer to a VRAM location, and its -contents aren't guaranteed to be preserved after calling con_deinit() -on the old driver and con_init() on the new driver, i.e. the -subsequent console resize may fill the framebuffer with garbage. - -It can be reproduced in the transition from vgacon to the nouveau -framebuffer driver: in that case the legacy VGA aperture "vc_origin" -points to becomes unreadable after fbcon_init(). - -This patch reverts the mentioned commit. To avoid the problem it -intended to fix, stop using "vc_scr_end" in vc_do_resize() to -calculate how many rows we have to copy (actually the code looks -simpler this way without the help of "vc_scr_end"). - -Signed-off-by: Francisco Jerez <currojerez@riseup.net> -Cc: qiaochong <qiaochong@loongson.cn> -Cc: Greg Kroah-Hartman <gregkh@suse.de> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Alan Cox <alan@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/vt.c | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) - ---- a/drivers/char/vt.c -+++ b/drivers/char/vt.c -@@ -906,22 +906,16 @@ static int vc_do_resize(struct tty_struc - * bottom of buffer - */ - old_origin += (old_rows - new_rows) * old_row_size; -- end = vc->vc_scr_end; - } else { - /* - * Cursor is in no man's land, copy 1/2 screenful - * from the top and bottom of cursor position - */ - old_origin += (vc->vc_y - new_rows/2) * old_row_size; -- end = old_origin + (old_row_size * new_rows); - } -- } else -- /* -- * Cursor near the top, copy contents from the top of buffer -- */ -- end = (old_rows > new_rows) ? old_origin + -- (old_row_size * new_rows) : -- vc->vc_scr_end; -+ } -+ -+ end = old_origin + old_row_size * min(old_rows, new_rows); - - update_attr(vc); - -@@ -3075,8 +3069,7 @@ static int bind_con_driver(const struct - - old_was_color = vc->vc_can_do_color; - vc->vc_sw->con_deinit(vc); -- if (!vc->vc_origin) -- vc->vc_origin = (unsigned long)vc->vc_screenbuf; -+ vc->vc_origin = (unsigned long)vc->vc_screenbuf; - visual_init(vc, i, 0); - set_origin(vc); - update_attr(vc); |