From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/Kconfig.kgdb       |   15 ---------------
 arch/i386/kernel/kgdb_stub.c |   16 +++++++---------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff -puN arch/i386/Kconfig.kgdb~kgdb-always-KGDB_CONSOLE arch/i386/Kconfig.kgdb
--- devel/arch/i386/Kconfig.kgdb~kgdb-always-KGDB_CONSOLE	2006-02-27 02:43:48.000000000 -0800
+++ devel-akpm/arch/i386/Kconfig.kgdb	2006-02-27 02:43:48.000000000 -0800
@@ -64,21 +64,6 @@ config KGDB_IRQ
 	  correctly and the kernel has interrupts on a control C to the
 	  port should cause a break into the kernel debug stub.
 
-config KGDB_CONSOLE
-	bool "Enable serial console thru kgdb port"
-	depends on KGDB
-	default n
-	help
-	  This option enables the command line "console=kgdb" option.
-	  When the system is booted with this option in the command line
-	  all kernel printk output is sent to gdb (as well as to other
-	  consoles).  For this to work gdb must be connected.  For this
-	  reason, this command line option will generate a breakpoint if
-	  gdb has not yet connected.  After the gdb continue command is
-	  given all pent up console output will be printed by gdb on the
-	  host machine.  Neither this option, nor KGDB require the
-	  serial driver to be configured.
-
 config KGDB_SYSRQ
 	bool "Turn on SysRq 'G' command to do a break?"
 	depends on KGDB
diff -puN arch/i386/kernel/kgdb_stub.c~kgdb-always-KGDB_CONSOLE arch/i386/kernel/kgdb_stub.c
--- devel/arch/i386/kernel/kgdb_stub.c~kgdb-always-KGDB_CONSOLE	2006-02-27 02:43:48.000000000 -0800
+++ devel-akpm/arch/i386/kernel/kgdb_stub.c	2006-02-27 02:43:48.000000000 -0800
@@ -104,6 +104,11 @@
 #include <linux/sched.h>
 #include <linux/irq.h>
 #include <linux/list.h>
+#include <linux/console.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
 
 #include <asm/vm86.h>
 #include <asm/system.h>
@@ -1817,14 +1822,8 @@ exit_kgdb:
 	return (0);
 }
 
-#ifdef CONFIG_KGDB_CONSOLE
-#include <linux/console.h>
-#include <linux/init.h>
-#include <linux/fs.h>
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
-
-void kgdb_console_write(struct console *co, const char *s, unsigned count)
+static void kgdb_console_write(struct console *co, const char *s,
+				unsigned count)
 {
 
 	if (kgdb_info.vector == -1) {
@@ -1954,7 +1953,6 @@ void kgdb_console_finit(void)
 	}
 }
 #endif
-#endif
 
 typedef int gdb_debug_hook(int exceptionVector,
 			int signo, int err_code, struct pt_regs *linux_regs);
_