]> git.itanic.dy.fi Git - linux-stable/commit
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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:15:07 +0000 (15:15 -0800)
commita59429bcfb8ef9b44478a37eafa560fe39c3f177
tree4d566f403f099a5a5bd5fc963b363902455e39ac
parent361832885331d935a4023f9645aa5e73cc5f539d
Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent

commit 8c6a98b22b750c9eb52653ba643faa17db8d3881 upstream.

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>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/tty/sysrq.c
include/linux/sysrq.h
kernel/sysctl.c