aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-05-24 10:08:19 +0200
committerJohn Crispin <john@phrozen.org>2018-05-24 16:03:58 +0200
commit2b7289cd3bb19812d91ae8ee1703eee8dcf2f748 (patch)
tree2e09314fc72f0f1fdf48598d7827ef412f914500 /target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
parentfdeba0e0efd5ce60baf1103d99f3c15a803e9ef8 (diff)
downloadupstream-2b7289cd3bb19812d91ae8ee1703eee8dcf2f748.tar.gz
upstream-2b7289cd3bb19812d91ae8ee1703eee8dcf2f748.tar.bz2
upstream-2b7289cd3bb19812d91ae8ee1703eee8dcf2f748.zip
kernel: bump 4.9 to 4.9.102 for 18.06
Refreshed all patches Added new ARM64 symbol: ARM64_ERRATUM_1024718 Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch')
-rw-r--r--target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
index 1cb51a2ed5..6cb745ee33 100644
--- a/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
+++ b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
-@@ -448,7 +448,7 @@ extern void uart_handle_cts_change(struc
+@@ -455,7 +455,7 @@ extern void uart_handle_cts_change(struc
extern void uart_insert_char(struct uart_port *port, unsigned int status,
unsigned int overrun, unsigned int ch, unsigned int flag);
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
{
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
-@@ -410,6 +410,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
+@@ -396,6 +396,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
This may be set to 1 or 0 to enable or disable them all, or
to a bitmask as described in Documentation/sysrq.txt.