diff -Nru linux/arch/mips/au1000/common/Makefile.orig linux/arch/mips/au1000/common/Makefile
--- linux/arch/mips/au1000/common/Makefile.orig	Thu Feb 13 11:37:29 2003
+++ linux/arch/mips/au1000/common/Makefile	Thu Feb 20 11:05:43 2003
@@ -13,7 +13,7 @@
 
 obj-$(CONFIG_AU1000_UART) += serial.o
 obj-$(CONFIG_AU1000_USB_DEVICE) += usbdev.o
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 obj-$(CONFIG_RTC) += rtc.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/au1000/common/dbg_io.c.orig linux/arch/mips/au1000/common/dbg_io.c
--- linux/arch/mips/au1000/common/dbg_io.c.orig	Mon Aug  5 17:08:53 2002
+++ linux/arch/mips/au1000/common/dbg_io.c	Thu Feb 20 11:05:43 2003
@@ -3,7 +3,7 @@
 #include <asm/io.h>
 #include <asm/au1000.h>
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 
 /*
  * FIXME the user should be able to select the
diff -Nru linux/arch/mips/au1000/common/irq.c.orig linux/arch/mips/au1000/common/irq.c
--- linux/arch/mips/au1000/common/irq.c.orig	Thu Dec 12 13:58:25 2002
+++ linux/arch/mips/au1000/common/irq.c	Thu Feb 20 11:05:43 2003
@@ -71,7 +71,7 @@
 #define EXT_INTC1_REQ1 5 /* IP 5 */
 #define MIPS_TIMER_IP  7 /* IP 7 */
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 #endif
 
@@ -492,7 +492,7 @@
 	}
 
 	set_c0_status(ALLINTS);
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	/* If local serial I/O used for debug port, enter kgdb at once */
 	puts("Waiting for kgdb to connect...");
 	set_debug_traps();
diff -Nru linux/arch/mips/au1000/common/serial.c.orig linux/arch/mips/au1000/common/serial.c
--- linux/arch/mips/au1000/common/serial.c.orig	Thu Dec 12 13:58:25 2002
+++ linux/arch/mips/au1000/common/serial.c	Thu Feb 20 11:05:43 2003
@@ -987,7 +987,7 @@
 		set_bit(TTY_IO_ERROR, &info->tty->flags);
 
 	info->flags &= ~ASYNC_INITIALIZED;
-#ifndef CONFIG_REMOTE_DEBUG
+#ifndef CONFIG_KGDB
 	au_writel(0, UART_MOD_CNTRL + state->port);
 	au_sync_delay(10);
 #endif
diff -Nru linux/arch/mips/baget/vacserial.c.orig linux/arch/mips/baget/vacserial.c
--- linux/arch/mips/baget/vacserial.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/baget/vacserial.c	Thu Feb 20 11:05:44 2003
@@ -2790,7 +2790,7 @@
 }
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 #undef PRINT_DEBUG_PORT_INFO
 
 /*
@@ -2902,4 +2902,4 @@
 	return(serial_inp(info, VAC_UART_RX));
 }
 
-#endif /* CONFIG_REMOTE_DEBUG */
+#endif /* CONFIG_KGDB */
diff -Nru linux/arch/mips/ddb5074/irq.c.orig linux/arch/mips/ddb5074/irq.c
--- linux/arch/mips/ddb5074/irq.c.orig	Mon Aug  5 17:08:54 2002
+++ linux/arch/mips/ddb5074/irq.c	Thu Feb 20 11:05:44 2003
@@ -210,7 +210,7 @@
 
 void __init ddb_irq_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug)
 		set_debug_traps();
 	breakpoint();		/* you may move this line to whereever you want :-) */
diff -Nru linux/arch/mips/ddb5074/setup.c.orig linux/arch/mips/ddb5074/setup.c
--- linux/arch/mips/ddb5074/setup.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/ddb5074/setup.c	Thu Feb 20 11:05:44 2003
@@ -27,7 +27,7 @@
 #include <asm/traps.h>
 
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
 #endif
diff -Nru linux/arch/mips/ddb5xxx/common/irq.c.orig linux/arch/mips/ddb5xxx/common/irq.c
--- linux/arch/mips/ddb5xxx/common/irq.c.orig	Sun Jul 14 17:00:55 2002
+++ linux/arch/mips/ddb5xxx/common/irq.c	Thu Feb 20 11:05:44 2003
@@ -19,7 +19,7 @@
 
 void __init init_IRQ(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	extern void breakpoint(void);
 	extern void set_debug_traps(void);
 
diff -Nru linux/arch/mips/ddb5xxx/ddb5074/irq.c.orig linux/arch/mips/ddb5xxx/ddb5074/irq.c
--- linux/arch/mips/ddb5xxx/ddb5074/irq.c.orig	Mon Aug  5 17:08:54 2002
+++ linux/arch/mips/ddb5xxx/ddb5074/irq.c	Thu Feb 20 11:05:44 2003
@@ -142,7 +142,7 @@
 
 void __init ddb_irq_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug)
 		set_debug_traps();
 	breakpoint();		/* you may move this line to whereever you want :-) */
diff -Nru linux/arch/mips/ddb5xxx/ddb5074/setup.c.orig linux/arch/mips/ddb5xxx/ddb5074/setup.c
--- linux/arch/mips/ddb5xxx/ddb5074/setup.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/ddb5xxx/ddb5074/setup.c	Thu Feb 20 11:05:44 2003
@@ -30,7 +30,7 @@
 #include <asm/ddb5xxx/ddb5xxx.h>
 
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
 #endif
diff -Nru linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c.orig linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c
--- linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c.orig	Mon Aug  5 17:08:54 2002
+++ linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c	Thu Feb 20 11:23:47 2003
@@ -281,7 +281,7 @@
 };
 
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 void jsun_scan_pci_bus(void)
 {
 	struct pci_bus bus;
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/Makefile.orig linux/arch/mips/ddb5xxx/ddb5476/Makefile
--- linux/arch/mips/ddb5xxx/ddb5476/Makefile.orig	Thu Feb 13 11:37:30 2003
+++ linux/arch/mips/ddb5xxx/ddb5476/Makefile	Thu Feb 20 11:05:44 2003
@@ -5,6 +5,6 @@
 
 obj-y				+= setup.o irq.o int-handler.o pci.o pci_ops.o \
 				   nile4_pic.o vrc5476_irq.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o
+obj-$(CONFIG_KGDB)	+= dbg_io.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/setup.c.orig linux/arch/mips/ddb5xxx/ddb5476/setup.c
--- linux/arch/mips/ddb5xxx/ddb5476/setup.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/ddb5xxx/ddb5476/setup.c	Thu Feb 20 11:05:44 2003
@@ -40,7 +40,7 @@
 #define TIMER_IRQ			(VRC5476_IRQ_BASE + VRC5476_IRQ_GPT)
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 #endif
 
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/pci.c.orig linux/arch/mips/ddb5xxx/ddb5476/pci.c
--- linux/arch/mips/ddb5xxx/ddb5476/pci.c.orig	Mon Aug  5 17:08:54 2002
+++ linux/arch/mips/ddb5xxx/ddb5476/pci.c	Thu Feb 20 11:23:47 2003
@@ -100,7 +100,7 @@
 	}
 }
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 extern void jsun_scan_pci_bus(void);
 #endif
 
diff -Nru linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c.orig linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c
--- linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c.orig	Mon Aug  5 17:08:54 2002
+++ linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c	Thu Feb 20 11:23:47 2003
@@ -296,7 +296,7 @@
 };
 
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 void jsun_scan_pci_bus(void)
 {
 	struct pci_bus bus;
diff -Nru linux/arch/mips/ddb5xxx/ddb5477/Makefile.orig linux/arch/mips/ddb5xxx/ddb5477/Makefile
--- linux/arch/mips/ddb5xxx/ddb5477/Makefile.orig	Thu Feb 13 11:37:30 2003
+++ linux/arch/mips/ddb5xxx/ddb5477/Makefile	Thu Feb 20 11:23:47 2003
@@ -4,7 +4,7 @@
 
 obj-y	 += int-handler.o irq.o irq_5477.o setup.o pci.o pci_ops.o lcd44780.o
 
-obj-$(CONFIG_DEBUG) 		+= debug.o
+obj-$(CONFIG_RUNTIME_DEBUG) 		+= debug.o
 obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb_io.o
 obj-$(CONFIG_BLK_DEV_INITRD)	+= ramdisk.o
 
diff -Nru linux/arch/mips/ddb5xxx/ddb5477/irq.c.orig linux/arch/mips/ddb5xxx/ddb5477/irq.c
--- linux/arch/mips/ddb5xxx/ddb5477/irq.c.orig	Fri Dec 13 09:47:00 2002
+++ linux/arch/mips/ddb5xxx/ddb5477/irq.c	Thu Feb 20 11:23:47 2003
@@ -176,7 +176,7 @@
 	db_assert(ddb_in32(DDB_NMISTAT) == 0);
 
 	if (ddb_in32(DDB_INT1STAT) != 0) {
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 		vrc5477_show_int_regs();
 #endif
 		panic("error interrupt has happened.");
diff -Nru linux/arch/mips/ddb5xxx/ddb5477/pci.c.orig linux/arch/mips/ddb5xxx/ddb5477/pci.c
--- linux/arch/mips/ddb5xxx/ddb5477/pci.c.orig	Fri Dec 13 09:47:00 2002
+++ linux/arch/mips/ddb5xxx/ddb5477/pci.c	Thu Feb 20 11:23:47 2003
@@ -165,7 +165,7 @@
 	}
 }
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 extern void jsun_scan_pci_bus(void);
 extern void jsun_assign_pci_resource(void);
 #endif
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/Makefile.orig linux/arch/mips/gt64120/momenco_ocelot/Makefile
--- linux/arch/mips/gt64120/momenco_ocelot/Makefile.orig	Thu Feb 13 11:37:30 2003
+++ linux/arch/mips/gt64120/momenco_ocelot/Makefile	Thu Feb 20 11:05:44 2003
@@ -4,6 +4,6 @@
 
 obj-y	 += int-handler.o irq.o pci.o prom.o reset.o setup.o
 
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c.orig linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c
--- linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c.orig	Thu Nov 29 07:09:48 2001
+++ linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c	Thu Feb 20 11:05:44 2003
@@ -1,6 +1,6 @@
 #include <linux/config.h>
 
-#if defined(CONFIG_REMOTE_DEBUG)
+#if defined(CONFIG_KGDB)
 
 #include <asm/serial.h> /* For the serial port location and base baud */
 
diff -Nru linux/arch/mips/gt64120/momenco_ocelot/irq.c.orig linux/arch/mips/gt64120/momenco_ocelot/irq.c
--- linux/arch/mips/gt64120/momenco_ocelot/irq.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/gt64120/momenco_ocelot/irq.c	Thu Feb 20 11:05:44 2003
@@ -162,7 +162,7 @@
 
 	gt64120_irq_init();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("start kgdb ...\n");
 	set_debug_traps();
 	breakpoint();	/* you may move this line to whereever you want :-) */
diff -Nru linux/arch/mips/hp-lj/Makefile.orig linux/arch/mips/hp-lj/Makefile
--- linux/arch/mips/hp-lj/Makefile.orig	Thu Feb 13 11:37:30 2003
+++ linux/arch/mips/hp-lj/Makefile	Thu Feb 20 11:05:44 2003
@@ -7,7 +7,7 @@
 
 obj-y   := init.o setup.o irq.o int-handler.o pci.o utils.o asic.o
 
-obj-$(CONFIG_REMOTE_DEBUG) += gdb_hook.o
+obj-$(CONFIG_KGDB) += gdb_hook.o
 obj-$(CONFIG_DIRECT_PRINTK) += gdb_hook.o
 
 obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
diff -Nru linux/arch/mips/hp-lj/irq.c.orig linux/arch/mips/hp-lj/irq.c
--- linux/arch/mips/hp-lj/irq.c.orig	Tue Dec 18 16:03:00 2001
+++ linux/arch/mips/hp-lj/irq.c	Thu Feb 20 11:05:45 2003
@@ -22,7 +22,7 @@
 	mips_cpu_irq_init(0);
 	set_except_vector(0, hpIRQ);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	{
 		extern void breakpoint(void);
 		extern int remote_debug;
diff -Nru linux/arch/mips/hp-lj/setup.c.orig linux/arch/mips/hp-lj/setup.c
--- linux/arch/mips/hp-lj/setup.c.orig	Mon Aug  5 17:08:55 2002
+++ linux/arch/mips/hp-lj/setup.c	Thu Feb 20 11:05:45 2003
@@ -20,7 +20,7 @@
 #include <asm/hp-lj/asic.h>
 #include "utils.h"
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 int remote_debug = 0;
 #endif
 
@@ -147,7 +147,7 @@
 
    board_timer_setup = hp_time_init;
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
    {
       extern char CommandLine[];
       remote_debug = (strstr(CommandLine, "kgdb") != NULL);
diff -Nru linux/arch/mips/ite-boards/generic/Makefile.orig linux/arch/mips/ite-boards/generic/Makefile
--- linux/arch/mips/ite-boards/generic/Makefile.orig	Thu Feb 13 11:37:30 2003
+++ linux/arch/mips/ite-boards/generic/Makefile	Thu Feb 20 11:05:45 2003
@@ -10,6 +10,6 @@
 
 obj-$(CONFIG_PCI) += it8172_pci.o
 obj-$(CONFIG_IT8172_CIR) += it8172_cir.o
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/ite-boards/generic/dbg_io.c.orig linux/arch/mips/ite-boards/generic/dbg_io.c
--- linux/arch/mips/ite-boards/generic/dbg_io.c.orig	Sun Mar 18 05:52:36 2001
+++ linux/arch/mips/ite-boards/generic/dbg_io.c	Thu Feb 20 11:05:45 2003
@@ -1,7 +1,7 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 
 /* --- CONFIG --- */
 
diff -Nru linux/arch/mips/ite-boards/generic/irq.c.orig linux/arch/mips/ite-boards/generic/irq.c
--- linux/arch/mips/ite-boards/generic/irq.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/ite-boards/generic/irq.c	Thu Feb 20 11:05:45 2003
@@ -65,7 +65,7 @@
 #define DPRINTK(fmt, args...)
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 #endif
 
@@ -301,7 +301,7 @@
 	irq_desc[MIPS_CPU_TIMER_IRQ].handler = &cp0_irq_type;
 	set_c0_status(ALLINTS_NOTIMER);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	/* If local serial I/O used for debug port, enter kgdb at once */
 	puts("Waiting for kgdb to connect...");
 	set_debug_traps();
diff -Nru linux/arch/mips/jmr3927/rbhma3100/Makefile.orig linux/arch/mips/jmr3927/rbhma3100/Makefile
--- linux/arch/mips/jmr3927/rbhma3100/Makefile.orig	Thu Feb 13 11:37:31 2003
+++ linux/arch/mips/jmr3927/rbhma3100/Makefile	Thu Feb 20 11:05:45 2003
@@ -5,6 +5,6 @@
 obj-y	 += init.o int-handler.o irq.o setup.o rtc.o pci_fixup.o pci_ops.o
 
 obj-$(CONFIG_LL_DEBUG) 		+= debug.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= kgdb_io.o
+obj-$(CONFIG_KGDB)	+= kgdb_io.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/jmr3927/rbhma3100/irq.c.orig linux/arch/mips/jmr3927/rbhma3100/irq.c
--- linux/arch/mips/jmr3927/rbhma3100/irq.c.orig	Thu Dec 12 13:58:26 2002
+++ linux/arch/mips/jmr3927/rbhma3100/irq.c	Thu Feb 20 11:05:45 2003
@@ -444,7 +444,7 @@
 void __init init_IRQ(void)
 {
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
         extern void breakpoint(void);
         extern void set_debug_traps(void);
 
diff -Nru linux/arch/mips/kernel/Makefile.orig linux/arch/mips/kernel/Makefile
--- linux/arch/mips/kernel/Makefile.orig	Thu Feb 13 11:37:31 2003
+++ linux/arch/mips/kernel/Makefile	Thu Feb 20 11:05:45 2003
@@ -36,7 +36,7 @@
 
 obj-$(CONFIG_BINFMT_IRIX)	+= irixelf.o irixioctl.o irixsig.o sysirix.o \
 				   irixinv.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= gdb-low.o gdb-stub.o
+obj-$(CONFIG_KGDB)	+= gdb-low.o gdb-stub.o
 obj-$(CONFIG_PROC_FS)		+= proc.o
 
 obj-$(CONFIG_NEW_PCI)          += pci.o
diff -Nru linux/arch/mips/kernel/gdb-stub.c.orig linux/arch/mips/kernel/gdb-stub.c
--- linux/arch/mips/kernel/gdb-stub.c.orig	Thu Feb 20 10:24:24 2003
+++ linux/arch/mips/kernel/gdb-stub.c	Thu Feb 20 11:05:45 2003
@@ -99,7 +99,7 @@
  *  the kernel running. It will promptly halt and wait
  *  for the host gdb session to connect. It does this
  *  since the "Kernel Hacking" option has defined
- *  CONFIG_REMOTE_DEBUG which in turn enables your calls
+ *  CONFIG_KGDB which in turn enables your calls
  *  to:
  *     set_debug_traps();
  *     breakpoint();
diff -Nru linux/arch/mips/mips-boards/atlas/atlas_int.c.orig linux/arch/mips/mips-boards/atlas/atlas_int.c
--- linux/arch/mips/mips-boards/atlas/atlas_int.c.orig	Sun Nov  3 17:52:47 2002
+++ linux/arch/mips/mips-boards/atlas/atlas_int.c	Thu Feb 20 11:05:45 2003
@@ -117,7 +117,7 @@
 	do_IRQ(irq, regs);
 }
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern int remote_debug;
 #endif
@@ -142,7 +142,7 @@
 		irq_desc[i].handler	= &atlas_irq_type;
 	}
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug) {
 		set_debug_traps();
 		breakpoint();
diff -Nru linux/arch/mips/mips-boards/atlas/atlas_setup.c.orig linux/arch/mips/mips-boards/atlas/atlas_setup.c
--- linux/arch/mips/mips-boards/atlas/atlas_setup.c.orig	Mon Aug  5 17:08:56 2002
+++ linux/arch/mips/mips-boards/atlas/atlas_setup.c	Thu Feb 20 11:05:45 2003
@@ -38,7 +38,7 @@
 char serial_console[20];
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void saa9730_kgdb_hook(void);
 extern void breakpoint(void);
@@ -64,7 +64,7 @@
 
 void __init atlas_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	int rs_putDebugChar(char);
 	char rs_getDebugChar(void);
 	int saa9730_putDebugChar(char);
@@ -90,7 +90,7 @@
 	}
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	argptr = prom_getcmdline();
 	if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {
 		int line;
diff -Nru linux/arch/mips/mips-boards/generic/Makefile.orig linux/arch/mips/mips-boards/generic/Makefile
--- linux/arch/mips/mips-boards/generic/Makefile.orig	Thu Feb 13 11:37:31 2003
+++ linux/arch/mips/mips-boards/generic/Makefile	Thu Feb 20 11:05:46 2003
@@ -23,6 +23,6 @@
 obj-$(CONFIG_MIPS_ATLAS)	+= time.o
 obj-$(CONFIG_MIPS_MALTA)	+= time.o
 obj-$(CONFIG_PCI)		+= pci.o
-obj-$(CONFIG_REMOTE_DEBUG)	+= gdb_hook.o
+obj-$(CONFIG_KGDB)	+= gdb_hook.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/mips-boards/malta/malta_int.c.orig linux/arch/mips/mips-boards/malta/malta_int.c
--- linux/arch/mips/mips-boards/malta/malta_int.c.orig	Thu Feb 20 10:24:24 2003
+++ linux/arch/mips/mips-boards/malta/malta_int.c	Thu Feb 20 11:05:46 2003
@@ -43,7 +43,7 @@
 extern void init_i8259_irqs (void);
 extern int mips_pcibios_iack(void);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern void set_debug_traps(void);
 extern int remote_debug;
@@ -142,7 +142,7 @@
 	init_generic_irq();
 	init_i8259_irqs();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (remote_debug) {
 		set_debug_traps();
 		breakpoint();
diff -Nru linux/arch/mips/mips-boards/malta/malta_setup.c.orig linux/arch/mips/mips-boards/malta/malta_setup.c
--- linux/arch/mips/mips-boards/malta/malta_setup.c.orig	Thu Feb 20 10:24:24 2003
+++ linux/arch/mips/mips-boards/malta/malta_setup.c	Thu Feb 20 11:05:46 2003
@@ -47,7 +47,7 @@
 char serial_console[20];
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 int remote_debug = 0;
 #endif
@@ -83,7 +83,7 @@
 
 void __init malta_setup(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	int rs_putDebugChar(char);
 	char rs_getDebugChar(void);
 	extern int (*generic_putDebugChar)(char);
@@ -109,7 +109,7 @@
 	}
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	argptr = prom_getcmdline();
 	if ((argptr = strstr(argptr, "kgdb=ttyS")) != NULL) {
 		int line;
diff -Nru linux/arch/mips/momentum/ocelot_g/Makefile.orig linux/arch/mips/momentum/ocelot_g/Makefile
--- linux/arch/mips/momentum/ocelot_g/Makefile.orig	Thu Feb 13 11:37:32 2003
+++ linux/arch/mips/momentum/ocelot_g/Makefile	Thu Feb 20 11:05:46 2003
@@ -4,6 +4,6 @@
 
 obj-y	 += gt-irq.o pci-irq.o pci.o int-handler.o irq.o prom.o reset.o setup.o
 
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -Nru linux/arch/mips/momentum/ocelot_g/dbg_io.c.orig linux/arch/mips/momentum/ocelot_g/dbg_io.c
--- linux/arch/mips/momentum/ocelot_g/dbg_io.c.orig	Mon Sep  2 09:10:57 2002
+++ linux/arch/mips/momentum/ocelot_g/dbg_io.c	Thu Feb 20 11:05:46 2003
@@ -1,6 +1,6 @@
 #include <linux/config.h>
 
-#if defined(CONFIG_REMOTE_DEBUG)
+#if defined(CONFIG_KGDB)
 
 #include <asm/serial.h> /* For the serial port location and base baud */
 
diff -Nru linux/arch/mips/momentum/ocelot_g/irq.c.orig linux/arch/mips/momentum/ocelot_g/irq.c
--- linux/arch/mips/momentum/ocelot_g/irq.c.orig	Thu Dec 12 13:58:27 2002
+++ linux/arch/mips/momentum/ocelot_g/irq.c	Thu Feb 20 11:05:46 2003
@@ -161,7 +161,7 @@
 
 	gt64240_irq_init();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("start kgdb ...\n");
 	set_debug_traps();
 	breakpoint();	/* you may move this line to whereever you want :-) */
diff -Nru linux/arch/mips/momentum/ocelot_c/Makefile.orig linux/arch/mips/momentum/ocelot_c/Makefile
--- linux/arch/mips/momentum/ocelot_c/Makefile.orig	Thu Feb 13 11:37:32 2003
+++ linux/arch/mips/momentum/ocelot_c/Makefile	Thu Feb 20 11:05:46 2003
@@ -5,4 +5,4 @@
 obj-y	 += mv-irq.o cpci-irq.o uart-irq.o int-handler.o irq.o
 obj-y    += pci-irq.o pci.o prom.o reset.o setup.o 
 
-obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o
diff -Nru linux/arch/mips/momentum/ocelot_c/dbg_io.c.orig linux/arch/mips/momentum/ocelot_c/dbg_io.c
--- linux/arch/mips/momentum/ocelot_c/dbg_io.c.orig	Tue Nov 12 11:40:25 2002
+++ linux/arch/mips/momentum/ocelot_c/dbg_io.c	Thu Feb 20 11:05:46 2003
@@ -1,6 +1,6 @@
 #include <linux/config.h>
 
-#if defined(CONFIG_REMOTE_DEBUG)
+#if defined(CONFIG_KGDB)
 
 #include <asm/serial.h> /* For the serial port location and base baud */
 
diff -Nru linux/arch/mips/momentum/ocelot_c/irq.c.orig linux/arch/mips/momentum/ocelot_c/irq.c
--- linux/arch/mips/momentum/ocelot_c/irq.c.orig	Sun Dec  1 16:27:47 2002
+++ linux/arch/mips/momentum/ocelot_c/irq.c	Thu Feb 20 11:05:46 2003
@@ -171,7 +171,7 @@
 	uart_irq_init();
 	cpci_irq_init();
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("start kgdb ...\n");
 	set_debug_traps();
 	breakpoint();	/* you may move this line to whereever you want :-) */
diff -Nru linux/arch/mips/philips/nino/irq.c.orig linux/arch/mips/philips/nino/irq.c
--- linux/arch/mips/philips/nino/irq.c.orig	Thu Dec 12 13:58:27 2002
+++ linux/arch/mips/philips/nino/irq.c	Thu Feb 20 11:05:46 2003
@@ -251,7 +251,7 @@
 
 void __init init_IRQ(void)
 {
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	extern void breakpoint(void);
 	extern void set_debug_traps(void);
 
diff -Nru linux/arch/mips/sgi-ip22/ip22-setup.c.orig linux/arch/mips/sgi-ip22/ip22-setup.c
--- linux/arch/mips/sgi-ip22/ip22-setup.c.orig	Thu Feb 13 11:37:32 2003
+++ linux/arch/mips/sgi-ip22/ip22-setup.c	Thu Feb 20 11:05:46 2003
@@ -30,7 +30,7 @@
 #include <asm/io.h>
 #include <asm/traps.h>
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void rs_kgdb_hook(int);
 extern void breakpoint(void);
 static int remote_debug = 0;
@@ -72,7 +72,7 @@
 void __init ip22_setup(void)
 {
 	char *ctype;
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	char *kgdb_ttyd;
 #endif
 	sgitime_init();
@@ -116,7 +116,7 @@
 	}
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	kgdb_ttyd = prom_getcmdline();
 	if ((kgdb_ttyd = strstr(kgdb_ttyd, "kgdb=ttyd")) != NULL) {
 		int line;
diff -Nru linux/arch/mips/sibyte/sb1250/irq.c.orig linux/arch/mips/sibyte/sb1250/irq.c
--- linux/arch/mips/sibyte/sb1250/irq.c.orig	Thu Feb 13 11:37:32 2003
+++ linux/arch/mips/sibyte/sb1250/irq.c	Thu Feb 20 11:05:47 2003
@@ -58,7 +58,7 @@
 extern unsigned long ldt_eoi_space;
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 extern void breakpoint(void);
 extern void set_debug_traps(void);
 
@@ -368,14 +368,14 @@
 #ifdef CONFIG_BCM1250_PROF
 	imask |= STATUSF_IP7;
 #endif
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	imask |= STATUSF_IP6;
 #endif
 	/* Enable necessary IPs, disable the rest */
 	change_c0_status(ST0_IM, imask);
 	set_except_vector(0, sb1250_irq_handler);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	if (kgdb_flag) {
 		/* Setup uart 1 settings, mapper */
 		out64(M_DUART_IMR_BRK, KSEG1 + A_DUART + R_DUART_IMR_B);
@@ -392,7 +392,7 @@
 #endif
 }
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 
 #include <linux/delay.h>
 
@@ -414,4 +414,4 @@
 	if (!user_mode(regs))
 		set_async_breakpoint(regs->cp0_epc);
 }
-#endif 	/* CONFIG_REMOTE_DEBUG */
+#endif 	/* CONFIG_KGDB */
diff -Nru linux/arch/mips/sibyte/sb1250/irq_handler.S.orig linux/arch/mips/sibyte/sb1250/irq_handler.S
--- linux/arch/mips/sibyte/sb1250/irq_handler.S.orig	Thu Feb 13 11:37:33 2003
+++ linux/arch/mips/sibyte/sb1250/irq_handler.S	Thu Feb 20 11:05:47 2003
@@ -108,7 +108,7 @@
 2:
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	/* KGDB (uart 1) interrupt is routed to IP[6] */
 	andi	t1, s0, CAUSEF_IP6
 	beqz	t1, 1f
diff -Nru linux/arch/mips/sibyte/swarm/Makefile.orig linux/arch/mips/sibyte/swarm/Makefile
--- linux/arch/mips/sibyte/swarm/Makefile.orig	Thu Feb 13 11:37:34 2003
+++ linux/arch/mips/sibyte/swarm/Makefile	Thu Feb 20 11:05:47 2003
@@ -2,4 +2,4 @@
 
 obj-y				= setup.o cmdline.o rtc_xicor1241.o rtc_m41t81.o
 
-obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o
+obj-$(CONFIG_KGDB)	+= dbg_io.o
diff -Nru linux/arch/mips/vr4181/common/irq.c.orig linux/arch/mips/vr4181/common/irq.c
--- linux/arch/mips/vr4181/common/irq.c.orig	Mon Aug  5 17:08:57 2002
+++ linux/arch/mips/vr4181/common/irq.c	Thu Feb 20 11:05:47 2003
@@ -238,7 +238,7 @@
 	setup_irq(VR4181_IRQ_RTCL1, &reserved);
 	setup_irq(VR4181_IRQ_RTCL2, &reserved);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("Setting debug traps - please connect the remote debugger.\n");
 
 	set_debug_traps();
diff -Nru linux/arch/mips/vr4181/osprey/Makefile.orig linux/arch/mips/vr4181/osprey/Makefile
--- linux/arch/mips/vr4181/osprey/Makefile.orig	Thu Feb 13 11:37:35 2003
+++ linux/arch/mips/vr4181/osprey/Makefile	Thu Feb 20 11:05:47 2003
@@ -4,4 +4,4 @@
 
 obj-y	 := setup.o prom.o reset.o
 
-obj-$(CONFIG_REMOTE_DEBUG)	+= dbg_io.o
+obj-$(CONFIG_KGDB)	+= dbg_io.o
diff -Nru linux/arch/mips/vr41xx/common/icu.c.orig linux/arch/mips/vr41xx/common/icu.c
--- linux/arch/mips/vr41xx/common/icu.c.orig	Thu Oct  3 09:57:50 2002
+++ linux/arch/mips/vr41xx/common/icu.c	Thu Feb 20 11:05:47 2003
@@ -339,7 +339,7 @@
 
 	set_except_vector(0, vr41xx_handle_interrupt);
 
-#ifdef CONFIG_REMOTE_DEBUG
+#ifdef CONFIG_KGDB
 	printk("Setting debug traps - please connect the remote debugger.\n");
 	set_debug_traps();
 	breakpoint();
diff -Nru linux/arch/mips/Makefile.orig linux/arch/mips/Makefile
--- linux/arch/mips/Makefile.orig	Thu Feb 13 11:37:29 2003
+++ linux/arch/mips/Makefile	Thu Feb 20 11:05:43 2003
@@ -45,7 +45,7 @@
 LDFLAGS_vmalinux		+= -G 0 -static # -N
 MODFLAGS			+= -mlong-calls
 
-cflags-$(CONFIG_REMOTE_DEBUG)	+= -g
+cflags-$(CONFIG_KGDB)	+= -g
 cflags-$(CONFIG_SB1XXX_CORELIS)	+= -mno-sched-prolog -fno-omit-frame-pointer
 
 check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
diff -Nru linux/arch/mips64/Makefile.orig linux/arch/mips64/Makefile
--- linux/arch/mips64/Makefile.orig	Thu Feb 13 11:37:35 2003
+++ linux/arch/mips64/Makefile	Thu Feb 20 11:05:47 2003
@@ -41,7 +41,7 @@
 LDFLAGS_vmlinux			+= -G 0 -static # -N
 MODFLAGS			+= -mlong-calls
 
-cflags-$(CONFIG_REMOTE_DEBUG)	+= -g
+cflags-$(CONFIG_KGDB)	+= -g
 cflags-$(CONFIG_SB1XXX_CORELIS)	+= -mno-sched-prolog -fno-omit-frame-pointer
 
 check_gcc = $(shell if $(AS) $(1) -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi)
diff -Nru linux/include/asm-mips/ddb5xxx/ddb5477.h.orig linux/include/asm-mips/ddb5xxx/ddb5477.h
--- linux/include/asm-mips/ddb5xxx/ddb5477.h.orig	Fri Dec 13 09:47:02 2002
+++ linux/include/asm-mips/ddb5xxx/ddb5477.h	Thu Feb 20 11:23:47 2003
@@ -329,7 +329,7 @@
  * debug routines
  */
 #ifndef __ASSEMBLY__
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_RUNTIME_DEBUG)
 extern void vrc5477_show_pdar_regs(void);
 extern void vrc5477_show_pci_regs(void);
 extern void vrc5477_show_bar_regs(void);
diff -Nru linux/include/asm-mips/debug.h.orig linux/include/asm-mips/debug.h
--- linux/include/asm-mips/debug.h.orig	Mon Aug  5 17:08:58 2002
+++ linux/include/asm-mips/debug.h	Thu Feb 20 11:23:47 2003
@@ -1,5 +1,5 @@
 /*
- * Debug macros for run-time debugging.  Turned on/off with CONFIG_DEBUG option.
+ * Debug macros for run-time debugging.  Turned on/off with CONFIG_RUNTIME_DEBUG option.
  *
  * Copyright (C) 2001 MontaVista Software Inc.
  * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
@@ -17,13 +17,13 @@
 #include <linux/config.h>
 
 /*
- * run-time macros for catching spurious errors.  Eable CONFIG_DEBUG in
+ * run-time macros for catching spurious errors.  Eable CONFIG_RUNTIME_DEBUG in
  * kernel hacking config menu to use them.
  *
  * Use them as run-time debugging aid.  NEVER USE THEM AS ERROR HANDLING CODE!!!
  */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_RUNTIME_DEBUG
 
 #include <linux/kernel.h>