diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2009-05-13 21:56:59 -0500 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2009-05-15 07:56:24 -0500 |
| commit | 364b5b7b1d793a7f98be55b6b154716dcae78dfc (patch) | |
| tree | 2c8d2571bde15bf7c376bd222b3cc916bd52c13d /kernel | |
| parent | 45d447406a19cbfd42720f066f156f4eb9d68801 (diff) | |
| download | linux-364b5b7b1d793a7f98be55b6b154716dcae78dfc.tar.gz linux-364b5b7b1d793a7f98be55b6b154716dcae78dfc.tar.bz2 linux-364b5b7b1d793a7f98be55b6b154716dcae78dfc.zip | |
sysrq, intel_fb: fix sysrq g collision
Commit 79e539453b34e35f39299a899d263b0a1f1670bd introduced a
regression where you cannot use sysrq 'g' to enter kgdb. The solution
is to move the intel fb sysrq over to V for video instead of G for
graphics. The SMP VOYAGER code to register for the sysrq-v is not
anywhere to be found in the mainline kernel, so the comments in the
code were cleaned up as well.
This patch also cleans up the sysrq definitions for kgdb to make it
generic for the kernel debugger, such that the sysrq 'g' can be used
in the future to enter a gdbstub or another kernel debugger.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kgdb.c | 4 |
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 |