Commit 769259160a0e0bae51f1e5377bacf1d0265e7001
Committed by
Linus Torvalds
Linus Torvalds
1 parent
c1a39e0505
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: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 3 additions and 9 deletions Side-by-side Diff
arch/frv/kernel/gdb-stub.c
| ... | ... | @@ -647,17 +647,11 @@ |
| 647 | 647 | } |
| 648 | 648 | #endif |
| 649 | 649 | |
| 650 | -#ifdef CONFIG_GDBSTUB_CONSOLE | |
| 650 | +#ifdef CONFIG_GDB_CONSOLE | |
| 651 | 651 | |
| 652 | -static kdev_t gdbstub_console_dev(struct console *con) | |
| 653 | -{ | |
| 654 | - return MKDEV(1,3); /* /dev/null */ | |
| 655 | -} | |
| 656 | - | |
| 657 | 652 | static struct console gdbstub_console = { |
| 658 | 653 | .name = "gdb", |
| 659 | 654 | .write = gdbstub_console_write, /* in break.S */ |
| 660 | - .device = gdbstub_console_dev, | |
| 661 | 655 | .flags = CON_PRINTBUFFER, |
| 662 | 656 | .index = -1, |
| 663 | 657 | }; |
| ... | ... | @@ -2021,7 +2015,7 @@ |
| 2021 | 2015 | ptr = mem2hex(gdbstub_banner, ptr, sizeof(gdbstub_banner) - 1, 0); |
| 2022 | 2016 | gdbstub_send_packet(output_buffer); |
| 2023 | 2017 | #endif |
| 2024 | -#if defined(CONFIG_GDBSTUB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE) | |
| 2018 | +#if defined(CONFIG_GDB_CONSOLE) && defined(CONFIG_GDBSTUB_IMMEDIATE) | |
| 2025 | 2019 | register_console(&gdbstub_console); |
| 2026 | 2020 | #endif |
| 2027 | 2021 | |
| ... | ... | @@ -2031,7 +2025,7 @@ |
| 2031 | 2025 | /* |
| 2032 | 2026 | * register the console at a more appropriate time |
| 2033 | 2027 | */ |
| 2034 | -#if defined (CONFIG_GDBSTUB_CONSOLE) && !defined(CONFIG_GDBSTUB_IMMEDIATE) | |
| 2028 | +#if defined (CONFIG_GDB_CONSOLE) && !defined(CONFIG_GDBSTUB_IMMEDIATE) | |
| 2035 | 2029 | static int __init gdbstub_postinit(void) |
| 2036 | 2030 | { |
| 2037 | 2031 | printk("registering console\n"); |