diff options
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.patch | 47 |
1 files changed, 47 insertions, 0 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 new file mode 100644 index 0000000000..7b62aeb2ea --- /dev/null +++ b/target/linux/generic/pending-4.9/890-uart_optional_sysrq.patch @@ -0,0 +1,47 @@ +From: John Crispin <john@phrozen.org> +Subject: serial: do not accept sysrq characters via serial port + +many embedded boards have a disconnected TTL level serial which can +generate some garbage that can lead to spurious false sysrq detects. + +[john@phrozen.org: sent upstream 22.12.2016] + +Signed-off-by: John Crispin <john@phrozen.org> +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + include/linux/serial_core.h | 2 +- + lib/Kconfig.debug | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h +index 344201437017..7e6165bc1cef 100644 +--- a/include/linux/serial_core.h ++++ b/include/linux/serial_core.h +@@ -448,7 +448,7 @@ extern void uart_handle_cts_change(struct uart_port *uport, + 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) + { +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index a6c8db1d62f6..062c580cdd68 100644 +--- 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 +-- +2.11.0 + |