summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-22 11:44:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-22 11:44:26 -0700
commite916beab22e00d95345bfa4f48981f2c88885f61 (patch)
tree8a50022d6ad51fe3d328f6987adf61a210fd3b08 /include
parent4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7 (diff)
parentedd63cb6b91024332d6983fc51058ac1ef0c081e (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function debug_core,kdb: fix kgdb_connected bit set in the wrong place Fix merge regression from external kdb to upstream kdb repair gdbstub to match the gdbserial protocol specification kdb: break out of kdb_ll() when command is terminated
Diffstat (limited to 'include')
-rw-r--r--include/linux/sysrq.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 4496322e28d..609e8ca5f53 100644
--- a/include/linux/sysrq.h
+++ b/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);