diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 76d079204df113afa9e382a43abb5e1a2135150d (patch) | |
tree | 8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/ar7/patches-3.18/500-serial_kludge.patch | |
parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
download | master-31e0f0ae-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz master-31e0f0ae-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 master-31e0f0ae-76d079204df113afa9e382a43abb5e1a2135150d.zip |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45711
Diffstat (limited to 'target/linux/ar7/patches-3.18/500-serial_kludge.patch')
-rw-r--r-- | target/linux/ar7/patches-3.18/500-serial_kludge.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar7/patches-3.18/500-serial_kludge.patch b/target/linux/ar7/patches-3.18/500-serial_kludge.patch index e5d5a914a3..08bd6a6f2d 100644 --- a/target/linux/ar7/patches-3.18/500-serial_kludge.patch +++ b/target/linux/ar7/patches-3.18/500-serial_kludge.patch @@ -1,6 +1,6 @@ --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c -@@ -323,6 +323,13 @@ static const struct serial8250_config ua +@@ -329,6 +329,13 @@ static const struct serial8250_config ua .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .flags = UART_CAP_FIFO | UART_CAP_AFE, }, @@ -14,9 +14,9 @@ }; /* Uart divisor latch read */ -@@ -2861,7 +2868,11 @@ static void serial8250_console_putchar(s - struct uart_8250_port *up = - container_of(port, struct uart_8250_port, port); +@@ -3174,7 +3181,11 @@ static void serial8250_console_putchar(s + { + struct uart_8250_port *up = up_to_u8250p(port); +#ifdef CONFIG_AR7 + wait_for_xmitr(up, BOTH_EMPTY); |