summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:08:51 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:08:51 +1100
commit3867ac7e86a24791a7afe30d31d53fe2c76723c2 (patch)
treea5567e52ec999ab6f668464d6ca9ac01dff4a3ca /lib
parentfd2d78ecb7c9cf77a4c365eed8b648932c9baf93 (diff)
parent36523b6830fa468ae9e0335601aed475480b7dd3 (diff)
Merge remote-tracking branch 'tty/tty-next'
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c6602d493715..30a2162fb19f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -416,6 +416,16 @@ 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
+ help
+ Many embedded boards have a disconnected TTL level serial which can
+ generate some garbage that can lead to spurious false sysrq detects.
+ This option allows you to decide whether you want to enable the
+ magic SysRq key.
+
config DEBUG_KERNEL
bool "Kernel debugging"
help