diff options
| author | Andy Whitcroft <apw@canonical.com> | 2011-01-24 12:31:38 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-24 12:33:36 -0500 |
| commit | 8c6a98b22b750c9eb52653ba643faa17db8d3881 (patch) | |
| tree | 682d083e544bf4b420b6972941c9f3e7493e77ef /drivers/char/sysrq.c | |
| parent | cb1b145929b5b7e1bdc5f76dd2905df9f89c038e (diff) | |
Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
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>
Diffstat (limited to 'drivers/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index c556ed9db13d..8e0dd254eb11 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <asm/irq_regs.h> | 46 | #include <asm/irq_regs.h> |
| 47 | 47 | ||
| 48 | /* Whether we react on sysrq keys or just ignore them */ | 48 | /* Whether we react on sysrq keys or just ignore them */ |
| 49 | static int __read_mostly sysrq_enabled = 1; | 49 | static int __read_mostly sysrq_enabled = SYSRQ_DEFAULT_ENABLE; |
| 50 | static bool __read_mostly sysrq_always_enabled; | 50 | static bool __read_mostly sysrq_always_enabled; |
| 51 | 51 | ||
| 52 | static bool sysrq_on(void) | 52 | static bool sysrq_on(void) |