diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2012-08-10 12:12:23 -0500 |
---|---|---|
committer | Jason Wessel <jason.wessel@windriver.com> | 2012-10-12 06:37:34 -0500 |
commit | 24b8592ec021c433e73e6d8000e71f5c341fdde0 (patch) | |
tree | fe07e8ab4fd64842745e74ac90cf0c679a6793dc /drivers/tty/serial/kgdboc.c | |
parent | 42c12213141d7c88e8f649b4bacd19ba14577658 (diff) | |
download | linux-stable-24b8592ec021c433e73e6d8000e71f5c341fdde0.tar.gz linux-stable-24b8592ec021c433e73e6d8000e71f5c341fdde0.tar.bz2 linux-stable-24b8592ec021c433e73e6d8000e71f5c341fdde0.zip |
kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell
It is a common enough mistake for people to specify "kdb" when they
meant to type "kbd" that the kgdboc can just accept both since they
both mean the same thing anyway. Specifically it is for the case
where you want kdb to be active on your graphics console + keyboard
(where kbd was the original abbreviation for keyboard).
With this change kgdboc will now accept either to mean the same thing:
kgdboc=kbd
kgdboc=kdb
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'drivers/tty/serial/kgdboc.c')
-rw-r--r-- | drivers/tty/serial/kgdboc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c index 2b42a01a81c6..509e71456d13 100644 --- a/drivers/tty/serial/kgdboc.c +++ b/drivers/tty/serial/kgdboc.c @@ -97,7 +97,8 @@ static void kgdboc_restore_input(void) static int kgdboc_register_kbd(char **cptr) { - if (strncmp(*cptr, "kbd", 3) == 0) { + if (strncmp(*cptr, "kbd", 3) == 0 || + strncmp(*cptr, "kdb", 3) == 0) { if (kdb_poll_idx < KDB_POLL_FUNC_MAX) { kdb_poll_funcs[kdb_poll_idx] = kdb_get_kbd_char; kdb_poll_idx++; |