diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-10-07 01:05:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-16 13:01:44 -0700 |
| commit | 8eaede49dfdc1ff1d727f9c913665b8009945191 (patch) | |
| tree | 094c592c127142c4f01766fb82e3a7973c87ca1c /kernel/sysctl.c | |
| parent | e8b5cbb041130ef297c90f8af2d3d45dfb9e6d15 (diff) | |
| download | op-kernel-dev-8eaede49dfdc1ff1d727f9c913665b8009945191.zip op-kernel-dev-8eaede49dfdc1ff1d727f9c913665b8009945191.tar.gz | |
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 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b2f06f3..8b80f1b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -190,7 +190,7 @@ static int proc_dostring_coredump(struct ctl_table *table, int write, #ifdef CONFIG_MAGIC_SYSRQ /* Note: sysrq code uses it's own private copy */ -static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE; +static int __sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE; static int sysrq_sysctl_handler(ctl_table *table, int write, void __user *buffer, size_t *lenp, |
