summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 08:06:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-15 08:06:45 -0700
commitade385e4d14f4158b3b27acd992a98bca4cd7f23 (patch)
tree9f20430f5690901936348b0c955327c4a37d3485 /kernel
parentc6538499814d8112c5d4d08570a7cf0758e5f8f5 (diff)
parentd34a792da969a00b0f653c512414411760f55a20 (diff)
downloadblackbird-op-linux-ade385e4d14f4158b3b27acd992a98bca4cd7f23.tar.gz
blackbird-op-linux-ade385e4d14f4158b3b27acd992a98bca4cd7f23.zip
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: kgdb: gdb documentation fix kgdb,i386: use address that SP register points to in the exception frame sysrq, intel_fb: fix sysrq g collision
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kgdb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kgdb.c b/kernel/kgdb.c
index e4dcfb2272a4..9147a3190c9d 100644
--- a/kernel/kgdb.c
+++ b/kernel/kgdb.c
@@ -1583,8 +1583,8 @@ static void sysrq_handle_gdb(int key, struct tty_struct *tty)
static struct sysrq_key_op sysrq_gdb_op = {
.handler = sysrq_handle_gdb,
- .help_msg = "Gdb",
- .action_msg = "GDB",
+ .help_msg = "debug(G)",
+ .action_msg = "DEBUG",
};
#endif
OpenPOWER on IntegriCloud