From fceb2e721e9abf630ebf38d5299e50f24868bc62 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Feb 2013 09:59:50 -0800
Subject: [PATCH] --- yaml --- r: 359199 b: refs/heads/master c:
 adf96e6f514a9e87aa3d26c8c9c03eca5be53df0 h: refs/heads/master i:   359197:
 f5446d9fc57340126e73e95df88dfa7c468cf56d   359195:
 3e8db1ddb040078f8728b4b3d0daec6301c6197b   359191:
 46095a5f6f9821307bd6fe256a86883aff3a3460   359183:
 913d73facdd7d03d29c4ae4824dc412575f1a3db   359167:
 417edc18132c1d9a5e10fd271a66f238ce2f02dc v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/tty/sysrq.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9723c1edd86e..a8b4c2180f28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09884964335e85e897876d17783c2ad33cf8a2e0
+refs/heads/master: adf96e6f514a9e87aa3d26c8c9c03eca5be53df0
diff --git a/trunk/drivers/tty/sysrq.c b/trunk/drivers/tty/sysrq.c
index 814655ee2d61..3687f0cad642 100644
--- a/trunk/drivers/tty/sysrq.c
+++ b/trunk/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);