Commit 76925916 authored by David Howells's avatar David Howells Committed by Linus Torvalds

FRV: Be (self-)consistent and use CONFIG_GDB_CONSOLE everywhere

Be (self-)consistent and use CONFIG_GDB_CONSOLE everywhere rather than using
CONFIG_GDBSTUB_CONSOLE in some places and not others.  This is also then
consistent with other archs.

Also remove the gdbstub console device() op which doesn't seem to be necessary
now (especially as it doesn't compile).

[Found by Robert P. J. Day <rpjday@mindspring.com>]
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c1a39e05
...@@ -647,17 +647,11 @@ void debug_to_serial(const char *p, int n) ...@@ -647,17 +647,11 @@ void debug_to_serial(const char *p, int n)
} }
#endif #endif
#ifdef CONFIG_GDBSTUB_CONSOLE #ifdef CONFIG_GDB_CONSOLE
static kdev_t gdbstub_console_dev(struct console *con)
{
return MKDEV(1,3); /* /dev/null */
}
static struct console gdbstub_console = { static struct console gdbstub_console = {
.name = "gdb", .name = "gdb",
.write = gdbstub_console_write, /* in break.S */ .write = gdbstub_console_write, /* in break.S */
.device = gdbstub_console_dev,
.flags = CON_PRINTBUFFER, .flags = CON_PRINTBUFFER,
.index = -1, .index = -1,
}; };
...@@ -2021,7 +2015,7 @@ void __init gdbstub_init(void) ...@@ -2021,7 +2015,7 @@ void __init gdbstub_init(void)
ptr = mem2hex(gdbstub_banner, ptr, sizeof(gdbstub_banner) - 1, 0); ptr = mem2hex(gdbstub_banner, ptr, sizeof(gdbstub_banner) - 1, 0);
gdbstub_send_packet(output_buffer); gdbstub_send_packet(output_buffer);
#endif #endif
#if defined(CONFIG_GDBSTUB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE) #if defined(CONFIG_GDB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE)
register_console(&gdbstub_console); register_console(&gdbstub_console);
#endif #endif
...@@ -2031,7 +2025,7 @@ void __init gdbstub_init(void) ...@@ -2031,7 +2025,7 @@ void __init gdbstub_init(void)
/* /*
* register the console at a more appropriate time * register the console at a more appropriate time
*/ */
#if defined (CONFIG_GDBSTUB_CONSOLE) && !defined(CONFIG_GDBSTUB_IMMEDIATE) #if defined (CONFIG_GDB_CONSOLE) && !defined(CONFIG_GDBSTUB_IMMEDIATE)
static int __init gdbstub_postinit(void) static int __init gdbstub_postinit(void)
{ {
printk("registering console\n"); printk("registering console\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment