From 1a7aef4830fa1fc27f3dd2a0aa4cd4b7237f2f73 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Wed, 21 Jul 2010 19:27:07 -0500
Subject: [PATCH] --- yaml --- r: 201157 b: refs/heads/master c:
 edd63cb6b91024332d6983fc51058ac1ef0c081e h: refs/heads/master i:   201155:
 3da3443943413c1c466cbc01bc90b3efbe134e17 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/char/sysrq.c        | 2 +-
 trunk/include/linux/sysrq.h       | 1 +
 trunk/kernel/debug/kdb/kdb_main.c | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cfcfbff84e74..2d6f70934354 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0679c63db655fa12007558e267bc0eb1d486fdb
+refs/heads/master: edd63cb6b91024332d6983fc51058ac1ef0c081e
diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c
index 5d64e3acb000..878ac0c2cc68 100644
--- a/trunk/drivers/char/sysrq.c
+++ b/trunk/drivers/char/sysrq.c
@@ -493,7 +493,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
                 sysrq_key_table[i] = op_p;
 }
 
-static void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
+void __handle_sysrq(int key, struct tty_struct *tty, int check_mask)
 {
 	struct sysrq_key_op *op_p;
 	int orig_log_level;
diff --git a/trunk/include/linux/sysrq.h b/trunk/include/linux/sysrq.h
index 4496322e28dd..609e8ca5f534 100644
--- a/trunk/include/linux/sysrq.h
+++ b/trunk/include/linux/sysrq.h
@@ -45,6 +45,7 @@ struct sysrq_key_op {
  */
 
 void handle_sysrq(int key, struct tty_struct *tty);
+void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
 int register_sysrq_key(int key, struct sysrq_key_op *op);
 int unregister_sysrq_key(int key, struct sysrq_key_op *op);
 struct sysrq_key_op *__sysrq_get_key_op(int key);
diff --git a/trunk/kernel/debug/kdb/kdb_main.c b/trunk/kernel/debug/kdb/kdb_main.c
index 7e9bfd54a0db..ebe4a287419e 100644
--- a/trunk/kernel/debug/kdb/kdb_main.c
+++ b/trunk/kernel/debug/kdb/kdb_main.c
@@ -1820,9 +1820,8 @@ static int kdb_sr(int argc, const char **argv)
 {
 	if (argc != 1)
 		return KDB_ARGCOUNT;
-	sysrq_toggle_support(1);
 	kdb_trap_printk++;
-	handle_sysrq(*argv[1], NULL);
+	__handle_sysrq(*argv[1], NULL, 0);
 	kdb_trap_printk--;
 
 	return 0;