From 769259160a0e0bae51f1e5377bacf1d0265e7001 Mon Sep 17 00:00:00 2001 From: David Howells Date: Sun, 15 Jul 2007 23:38:27 -0700 Subject: [PATCH] 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 ] Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/frv/kernel/gdb-stub.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c index 1e7a101cbf..e89cad1192 100644 --- a/arch/frv/kernel/gdb-stub.c +++ b/arch/frv/kernel/gdb-stub.c @@ -647,17 +647,11 @@ void debug_to_serial(const char *p, int n) } #endif -#ifdef CONFIG_GDBSTUB_CONSOLE - -static kdev_t gdbstub_console_dev(struct console *con) -{ - return MKDEV(1,3); /* /dev/null */ -} +#ifdef CONFIG_GDB_CONSOLE static struct console gdbstub_console = { .name = "gdb", .write = gdbstub_console_write, /* in break.S */ - .device = gdbstub_console_dev, .flags = CON_PRINTBUFFER, .index = -1, }; @@ -2021,7 +2015,7 @@ void __init gdbstub_init(void) ptr = mem2hex(gdbstub_banner, ptr, sizeof(gdbstub_banner) - 1, 0); gdbstub_send_packet(output_buffer); #endif -#if defined(CONFIG_GDBSTUB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE) +#if defined(CONFIG_GDB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE) register_console(&gdbstub_console); #endif @@ -2031,7 +2025,7 @@ void __init gdbstub_init(void) /* * 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) { printk("registering console\n"); -- 2.39.5