Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / sysrq.c

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 814655ee2d6126bace613a3464d81475f2be9362..3687f0cad6421c01c4e0e62d2345165c80765dc9 100644 (file)
--- 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);