Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
authorAndy Whitcroft <apw@canonical.com>
Mon, 24 Jan 2011 17:31:38 +0000 (09:31 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 24 Jan 2011 17:33:36 +0000 (09:33 -0800)
commit8c6a98b22b750c9eb52653ba643faa17db8d3881
tree682d083e544bf4b420b6972941c9f3e7493e77ef
parentcb1b145929b5b7e1bdc5f76dd2905df9f89c038e
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>
drivers/char/sysrq.c
include/linux/sysrq.h
kernel/sysctl.c