summaryrefslogtreecommitdiffstats
path: root/drivers/tty/sysrq.c
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-10-07 02:05:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-16 22:01:44 +0200
commit8eaede49dfdc1ff1d727f9c913665b8009945191 (patch)
tree094c592c127142c4f01766fb82e3a7973c87ca1c /drivers/tty/sysrq.c
parentsysrq: Document hexadecimal values for kernel.sysrq bitmask (diff)
downloadlinux-8eaede49dfdc1ff1d727f9c913665b8009945191.tar.xz
linux-8eaede49dfdc1ff1d727f9c913665b8009945191.zip
sysrq: Allow magic SysRq key functions to be disabled through Kconfig
Turn the initial value of sysctl kernel.sysrq (SYSRQ_DEFAULT_ENABLE) into a Kconfig variable. Original version by Bastian Blank <waldi@debian.org>. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/sysrq.c')
-rw-r--r--drivers/tty/sysrq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 40a9fe9d3b10..ce396ecdf412 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -51,7 +51,7 @@
#include <asm/irq_regs.h>
/* Whether we react on sysrq keys or just ignore them */
-static int __read_mostly sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
+static int __read_mostly sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE;
static bool __read_mostly sysrq_always_enabled;
unsigned short platform_sysrq_reset_seq[] __weak = { KEY_RESERVED };