aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-4.9
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-05 11:06:09 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-06 11:56:18 +0200
commit2807f84b629c1a05304e4b39447973084889d9de (patch)
tree714c62e3e670a277753d287dee233f571b649416 /target/linux/ixp4xx/patches-4.9
parent7e4ce0c655ef61e2ba80e1605362f132b5678d27 (diff)
downloadupstream-2807f84b629c1a05304e4b39447973084889d9de.tar.gz
upstream-2807f84b629c1a05304e4b39447973084889d9de.tar.bz2
upstream-2807f84b629c1a05304e4b39447973084889d9de.zip
kernel: bump 4.9 to 4.9.187
Refreshed all patches. Altered patches: - 021-bridge-multicast-to-unicast.patch Remove upstreamed: - 001-um-Allow-building-and-running-on-older-hosts.patch - 003-um-Fix-check-for-_xstate-for-older-hosts.patch Fixes: - CVE-2019-10207 - CVE-2019-13648 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ixp4xx/patches-4.9')
-rw-r--r--target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
index 5f9f5a4b6e..3b94280179 100644
--- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
+++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
@@ -18,7 +18,7 @@
uart->capabilities = up->capabilities;
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -2254,6 +2254,7 @@ uart_report_port(struct uart_driver *drv
+@@ -2259,6 +2259,7 @@ uart_report_port(struct uart_driver *drv
snprintf(address, sizeof(address),
"I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
break;
@@ -26,7 +26,7 @@
case UPIO_MEM:
case UPIO_MEM16:
case UPIO_MEM32:
-@@ -2926,6 +2927,7 @@ int uart_match_port(struct uart_port *po
+@@ -2931,6 +2932,7 @@ int uart_match_port(struct uart_port *po
case UPIO_HUB6:
return (port1->iobase == port2->iobase) &&
(port1->hub6 == port2->hub6);
@@ -105,7 +105,7 @@
case UPIO_AU:
p->serial_out(p, offset, value);
p->serial_in(p, UART_LCR); /* safe, no side-effects */
-@@ -2758,6 +2778,7 @@ static int serial8250_request_std_resour
+@@ -2759,6 +2779,7 @@ static int serial8250_request_std_resour
case UPIO_MEM32BE:
case UPIO_MEM16:
case UPIO_MEM:
@@ -113,7 +113,7 @@
if (!port->mapbase)
break;
-@@ -2796,6 +2817,7 @@ static void serial8250_release_std_resou
+@@ -2797,6 +2818,7 @@ static void serial8250_release_std_resou
case UPIO_MEM32BE:
case UPIO_MEM16:
case UPIO_MEM: