From: Jason Wessel Date: Fri, 10 Aug 2012 17:12:23 +0000 (-0500) Subject: kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell X-Git-Tag: MMI-PSA29.97-13-9~15743^2~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24b8592ec021c433e73e6d8000e71f5c341fdde0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 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++;