diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-11-19 00:09:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-11-19 00:09:21 +0000 |
| commit | 86249078e2ac2d46efa651df281f8ca94da3749a (patch) | |
| tree | 57c494b97aca38f5b372c236a0e9ea8522fc1a7d | |
| parent | bf4ffc97304b44a9e41525cfcd7106c4a0742c88 (diff) | |
| download | upstream-86249078e2ac2d46efa651df281f8ca94da3749a.tar.gz upstream-86249078e2ac2d46efa651df281f8ca94da3749a.tar.bz2 upstream-86249078e2ac2d46efa651df281f8ca94da3749a.zip | |
kernel: do not accept sysrq characters via serial port
many boards have a disconnected TTL level serial which can generate
some garbage that can lead to spurious false sysrq detects.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r37210
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@38863 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/config-3.3 | 1 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.3/890-8250_optional_sysrq.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3 index 4f18587ca9..8f2f437bc0 100644 --- a/target/linux/generic/config-3.3 +++ b/target/linux/generic/config-3.3 @@ -2576,6 +2576,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=2 # CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_SYSRQ is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set CONFIG_SERIAL_CORE=y diff --git a/target/linux/generic/patches-3.3/890-8250_optional_sysrq.patch b/target/linux/generic/patches-3.3/890-8250_optional_sysrq.patch new file mode 100644 index 0000000000..414e18e825 --- /dev/null +++ b/target/linux/generic/patches-3.3/890-8250_optional_sysrq.patch @@ -0,0 +1,24 @@ +--- a/drivers/tty/serial/8250/8250.c ++++ b/drivers/tty/serial/8250/8250.c +@@ -16,7 +16,7 @@ + * membase is an 'ioremapped' cookie. + */ + +-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) ++#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ) + #define SUPPORT_SYSRQ + #endif + +--- a/drivers/tty/serial/8250/Kconfig ++++ b/drivers/tty/serial/8250/Kconfig +@@ -66,6 +66,10 @@ config SERIAL_8250_CONSOLE + + If unsure, say N. + ++config SERIAL_8250_SYSRQ ++ bool "Magic sysrq support on 8250/16550 devices" ++ depends on SERIAL_8250_CONSOLE ++ + config FIX_EARLYCON_MEM + bool + depends on X86 |