Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent (8c6a98b2) · Commits · 戴 / test

Currently sysrq_enabled and __sysrq_enabled are initialised separately and inconsistently, leading to sysrq being actually enabled by reported as not enabled in sysfs. The first change to the sysfs configurable synchronises these two: static int __read_mostly sysrq_enabled = 1; static int __sysrq_enabled; Add a common define to carry the default for these preventing them becoming out of sync again. Default this to 1 to mirror previous behaviour. Signed-off-by:

Andy Whitcroft <apw@canonical.com> Cc: stable@kernel.org Signed-off-by:

Dmitry Torokhov <dtor@mail.ru>

drivers/char/sysrq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		#include <asm/irq_regs.h>

		/* Whether we react on sysrq keys or just ignore them */
		static int __read_mostly sysrq_enabled = 1;
		static int __read_mostly sysrq_enabled = SYSRQ_DEFAULT_ENABLE;
		static bool __read_mostly sysrq_always_enabled;

		static bool sysrq_on(void)

include/linux/sysrq.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@
		#include <linux/errno.h>
		#include <linux/types.h>

		/* Enable/disable SYSRQ support by default (0==no, 1==yes). */
		#define SYSRQ_DEFAULT_ENABLE 1

		/* Possible values of bitmask for enabling sysrq functions */
		/* 0x0001 is reserved for enable everything */
		#define SYSRQ_ENABLE_LOG 0x0002

kernel/sysctl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,8 @@ static int proc_taint(struct ctl_table *table, int write,
		#endif

		#ifdef CONFIG_MAGIC_SYSRQ
		static int __sysrq_enabled; /* Note: sysrq code ises it's own private copy */
		/* Note: sysrq code uses it's own private copy */
		static int __sysrq_enabled = SYSRQ_DEFAULT_ENABLE;

		static int sysrq_sysctl_handler(ctl_table *table, int write,
		void __user buffer, size_t lenp,

Admin message