aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-01-27 14:32:10 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-04 20:28:14 +0100
commitf791fb4af45032a653ba7c850f4564923871cb16 (patch)
treec1fc4e564c8e27faad582e5b55a9ce91816a241c /target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch
parent7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c (diff)
downloadupstream-f791fb4af45032a653ba7c850f4564923871cb16.tar.gz
upstream-f791fb4af45032a653ba7c850f4564923871cb16.tar.bz2
upstream-f791fb4af45032a653ba7c850f4564923871cb16.zip
kernel: add linux 4.9 support
Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Tim Harvey <tharvey@gateworks.com> [fixes]
Diffstat (limited to 'target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch')
-rw-r--r--target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch b/target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch
new file mode 100644
index 0000000000..5f7de2bb0a
--- /dev/null
+++ b/target/linux/generic/patches-4.9/890-uart_optional_sysrq.patch
@@ -0,0 +1,25 @@
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -397,6 +397,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.
+
++config MAGIC_SYSRQ_SERIAL
++ bool "Enable magic SysRq key over serial"
++ depends on MAGIC_SYSRQ
++ default y
++
+ config DEBUG_KERNEL
+ bool "Kernel debugging"
+ help
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
+@@ -448,7 +448,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);
+
+-#ifdef SUPPORT_SYSRQ
++#if defined(SUPPORT_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ_SERIAL)
+ static inline int
+ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
+ {