From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 24 Jan 2011 17:31:38 +0000 (-0800)
Subject: Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
X-Git-Tag: v2.6.37.1~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a59429bcfb8ef9b44478a37eafa560fe39c3f177;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed