diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 14:02:27 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 14:02:27 +0100 |
commit | b3fecf8cab6441527ab057c99d7e6a6d7f6713e5 (patch) | |
tree | d327499840a25fbd1f81e49d5cb6769bdad382f5 /drivers/tty/sysrq.c | |
parent | 5b62efd8250d6a751c31d1972e96bfccd19c4679 (diff) | |
parent | 83a44ac8bf4a8e6cbbf0c00ff281a482778f708a (diff) | |
download | lwn-b3fecf8cab6441527ab057c99d7e6a6d7f6713e5.tar.gz lwn-b3fecf8cab6441527ab057c99d7e6a6d7f6713e5.zip |
Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen
Diffstat (limited to 'drivers/tty/sysrq.c')
-rw-r--r-- | drivers/tty/sysrq.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 814655ee2d61..3687f0cad642 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -870,21 +870,20 @@ static struct input_handler sysrq_handler = { static bool sysrq_handler_registered; +unsigned short platform_sysrq_reset_seq[] __weak = { KEY_RESERVED }; + static inline void sysrq_register_handler(void) { - extern unsigned short platform_sysrq_reset_seq[] __weak; unsigned short key; int error; int i; - if (platform_sysrq_reset_seq) { - for (i = 0; i < ARRAY_SIZE(sysrq_reset_seq); i++) { - key = platform_sysrq_reset_seq[i]; - if (key == KEY_RESERVED || key > KEY_MAX) - break; + for (i = 0; i < ARRAY_SIZE(sysrq_reset_seq); i++) { + key = platform_sysrq_reset_seq[i]; + if (key == KEY_RESERVED || key > KEY_MAX) + break; - sysrq_reset_seq[sysrq_reset_seq_len++] = key; - } + sysrq_reset_seq[sysrq_reset_seq_len++] = key; } error = input_register_handler(&sysrq_handler); |