? .config.cmd Index: arch/mips/Kconfig-shared =================================================================== RCS file: /home/cvs/linux/arch/mips/Kconfig-shared,v retrieving revision 1.18 diff -u -r1.18 Kconfig-shared --- arch/mips/Kconfig-shared 25 Feb 2003 22:27:43 -0000 1.18 +++ arch/mips/Kconfig-shared 26 Feb 2003 21:12:56 -0000 @@ -1550,7 +1550,7 @@ config DEBUG_KERNEL bool "Kernel debugging" -config REMOTE_DEBUG +config KGDB bool "Remote GDB kernel debugging" depends on DEBUG_KERNEL help @@ -1562,19 +1562,19 @@ config GDB_CONSOLE bool "Console output to GDB" - depends on REMOTE_DEBUG + depends on KGDB help If you are using GDB for remote debugging over a serial port and would like kernel messages to be formatted into GDB $O packets so that GDB prints them as program output, say 'Y'. -config DEBUG +config RUNTIME_DEBUG bool "Enable run-time debugging" depends on DEBUG_KERNEL help If you say Y here, some debugging macros will do run-time checking. - If you say N here, those macros will mostly turn to no-ops. For - MIPS boards only. See include/asm-mips/debug.h for debuging macros. + If you say N here, those macros will mostly turn to no-ops. See + include/asm-mips/debug.h for debuging macros. If unsure, say N. Index: arch/mips/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/Makefile,v retrieving revision 1.108 diff -u -r1.108 Makefile --- arch/mips/Makefile 25 Feb 2003 22:39:02 -0000 1.108 +++ arch/mips/Makefile 26 Feb 2003 21:12:56 -0000 @@ -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) Index: arch/mips/au1000/common/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/au1000/common/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- arch/mips/au1000/common/Makefile 2 Jan 2003 14:18:47 -0000 1.14 +++ arch/mips/au1000/common/Makefile 26 Feb 2003 21:12:56 -0000 @@ -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) Index: arch/mips/au1000/common/dbg_io.c =================================================================== RCS file: /home/cvs/linux/arch/mips/au1000/common/dbg_io.c,v retrieving revision 1.5 diff -u -r1.5 dbg_io.c --- arch/mips/au1000/common/dbg_io.c 6 Aug 2002 00:08:53 -0000 1.5 +++ arch/mips/au1000/common/dbg_io.c 26 Feb 2003 21:12:56 -0000 @@ -3,7 +3,7 @@ #include #include -#ifdef CONFIG_REMOTE_DEBUG +#ifdef CONFIG_KGDB /* * FIXME the user should be able to select the Index: arch/mips/au1000/common/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/au1000/common/irq.c,v retrieving revision 1.23 diff -u -r1.23 irq.c --- arch/mips/au1000/common/irq.c 2 Dec 2002 00:27:43 -0000 1.23 +++ arch/mips/au1000/common/irq.c 26 Feb 2003 21:12:56 -0000 @@ -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(); Index: arch/mips/au1000/common/serial.c =================================================================== RCS file: /home/cvs/linux/arch/mips/au1000/common/serial.c,v retrieving revision 1.17 diff -u -r1.17 serial.c --- arch/mips/au1000/common/serial.c 7 Nov 2002 01:25:47 -0000 1.17 +++ arch/mips/au1000/common/serial.c 26 Feb 2003 21:12:58 -0000 @@ -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 Index: arch/mips/baget/vacserial.c =================================================================== RCS file: /home/cvs/linux/arch/mips/baget/vacserial.c,v retrieving revision 1.19 diff -u -r1.19 vacserial.c --- arch/mips/baget/vacserial.c 7 Nov 2002 01:25:47 -0000 1.19 +++ arch/mips/baget/vacserial.c 26 Feb 2003 21:13:00 -0000 @@ -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 */ Index: arch/mips/ddb5xxx/common/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/common/irq.c,v retrieving revision 1.4 diff -u -r1.4 irq.c --- arch/mips/ddb5xxx/common/irq.c 15 Jul 2002 00:00:55 -0000 1.4 +++ arch/mips/ddb5xxx/common/irq.c 26 Feb 2003 21:13:00 -0000 @@ -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); Index: arch/mips/ddb5xxx/ddb5074/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5074/irq.c,v retrieving revision 1.2 diff -u -r1.2 irq.c --- arch/mips/ddb5xxx/ddb5074/irq.c 6 Aug 2002 00:08:54 -0000 1.2 +++ arch/mips/ddb5xxx/ddb5074/irq.c 26 Feb 2003 21:13:00 -0000 @@ -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 :-) */ Index: arch/mips/ddb5xxx/ddb5074/nile4_pic.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5074/nile4_pic.c,v retrieving revision 1.2 diff -u -r1.2 nile4_pic.c --- arch/mips/ddb5xxx/ddb5074/nile4_pic.c 6 Aug 2002 00:08:54 -0000 1.2 +++ arch/mips/ddb5xxx/ddb5074/nile4_pic.c 26 Feb 2003 21:13:00 -0000 @@ -260,7 +260,7 @@ } -#if defined(CONFIG_LL_DEBUG) +#if defined(CONFIG_RUNTIME_DEBUG) void nile4_dump_irq_status(void) { printk(KERN_DEBUG " Index: arch/mips/ddb5xxx/ddb5074/pci_ops.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5074/pci_ops.c,v retrieving revision 1.2 diff -u -r1.2 pci_ops.c --- arch/mips/ddb5xxx/ddb5074/pci_ops.c 6 Aug 2002 00:08:54 -0000 1.2 +++ arch/mips/ddb5xxx/ddb5074/pci_ops.c 26 Feb 2003 21:13:00 -0000 @@ -281,7 +281,7 @@ }; -#if defined(CONFIG_DEBUG) +#if defined(CONFIG_RUNTIME_DEBUG) void jsun_scan_pci_bus(void) { struct pci_bus bus; Index: arch/mips/ddb5xxx/ddb5074/setup.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5074/setup.c,v retrieving revision 1.4 diff -u -r1.4 setup.c --- arch/mips/ddb5xxx/ddb5074/setup.c 2 Dec 2002 00:27:43 -0000 1.4 +++ arch/mips/ddb5xxx/ddb5074/setup.c 26 Feb 2003 21:13:00 -0000 @@ -30,7 +30,7 @@ #include -#ifdef CONFIG_REMOTE_DEBUG +#ifdef CONFIG_KGDB extern void rs_kgdb_hook(int); extern void breakpoint(void); #endif Index: arch/mips/ddb5xxx/ddb5476/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5476/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- arch/mips/ddb5xxx/ddb5476/Makefile 2 Jan 2003 14:18:47 -0000 1.6 +++ arch/mips/ddb5xxx/ddb5476/Makefile 26 Feb 2003 21:13:00 -0000 @@ -3,8 +3,8 @@ # under Linux. # -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-y += setup.o irq.o int-handler.o pci.o pci_ops.o \ + nile4_pic.o vrc5476_irq.o +obj-$(CONFIG_KGDB) += dbg_io.o EXTRA_AFLAGS := $(CFLAGS) Index: arch/mips/ddb5xxx/ddb5476/nile4_pic.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5476/nile4_pic.c,v retrieving revision 1.4 diff -u -r1.4 nile4_pic.c --- arch/mips/ddb5xxx/ddb5476/nile4_pic.c 6 Aug 2002 00:08:54 -0000 1.4 +++ arch/mips/ddb5xxx/ddb5476/nile4_pic.c 26 Feb 2003 21:13:00 -0000 @@ -163,7 +163,7 @@ return irq + I8259_IRQ_BASE; } -#if defined(CONFIG_LL_DEBUG) +#if defined(CONFIG_RUNTIME_DEBUG) void nile4_dump_irq_status(void) { printk(KERN_DEBUG " Index: arch/mips/ddb5xxx/ddb5476/pci.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5476/pci.c,v retrieving revision 1.5 diff -u -r1.5 pci.c --- arch/mips/ddb5xxx/ddb5476/pci.c 6 Aug 2002 00:08:54 -0000 1.5 +++ arch/mips/ddb5xxx/ddb5476/pci.c 26 Feb 2003 21:13:00 -0000 @@ -100,7 +100,7 @@ } } -#if defined(CONFIG_DEBUG) +#if defined(CONFIG_RUNTIME_DEBUG) extern void jsun_scan_pci_bus(void); #endif Index: arch/mips/ddb5xxx/ddb5476/pci_ops.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5476/pci_ops.c,v retrieving revision 1.4 diff -u -r1.4 pci_ops.c --- arch/mips/ddb5xxx/ddb5476/pci_ops.c 6 Aug 2002 00:08:54 -0000 1.4 +++ arch/mips/ddb5xxx/ddb5476/pci_ops.c 26 Feb 2003 21:13:00 -0000 @@ -296,7 +296,7 @@ }; -#if defined(CONFIG_DEBUG) +#if defined(CONFIG_RUNTIME_DEBUG) void jsun_scan_pci_bus(void) { struct pci_bus bus; Index: arch/mips/ddb5xxx/ddb5476/setup.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5476/setup.c,v retrieving revision 1.11 diff -u -r1.11 setup.c --- arch/mips/ddb5xxx/ddb5476/setup.c 2 Dec 2002 00:27:44 -0000 1.11 +++ arch/mips/ddb5xxx/ddb5476/setup.c 26 Feb 2003 21:13:00 -0000 @@ -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 Index: arch/mips/ddb5xxx/ddb5477/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5477/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- arch/mips/ddb5xxx/ddb5477/Makefile 2 Jan 2003 14:18:47 -0000 1.8 +++ arch/mips/ddb5xxx/ddb5477/Makefile 26 Feb 2003 21:13:00 -0000 @@ -4,8 +4,8 @@ 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_REMOTE_DEBUG) += kgdb_io.o +obj-$(CONFIG_RUNTIME_DEBUG) += debug.o +obj-$(CONFIG_KGDB) += kgdb_io.o obj-$(CONFIG_BLK_DEV_INITRD) += ramdisk.o EXTRA_AFLAGS := $(CFLAGS) Index: arch/mips/ddb5xxx/ddb5477/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5477/irq.c,v retrieving revision 1.9 diff -u -r1.9 irq.c --- arch/mips/ddb5xxx/ddb5477/irq.c 13 Dec 2002 00:33:41 -0000 1.9 +++ arch/mips/ddb5xxx/ddb5477/irq.c 26 Feb 2003 21:13:00 -0000 @@ -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."); Index: arch/mips/ddb5xxx/ddb5477/pci.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ddb5xxx/ddb5477/pci.c,v retrieving revision 1.8 diff -u -r1.8 pci.c --- arch/mips/ddb5xxx/ddb5477/pci.c 13 Dec 2002 00:33:41 -0000 1.8 +++ arch/mips/ddb5xxx/ddb5477/pci.c 26 Feb 2003 21:13:00 -0000 @@ -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 Index: arch/mips/gt64120/momenco_ocelot/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/gt64120/momenco_ocelot/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- arch/mips/gt64120/momenco_ocelot/Makefile 2 Jan 2003 14:18:47 -0000 1.6 +++ arch/mips/gt64120/momenco_ocelot/Makefile 26 Feb 2003 21:13:00 -0000 @@ -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) Index: arch/mips/gt64120/momenco_ocelot/dbg_io.c =================================================================== RCS file: /home/cvs/linux/arch/mips/gt64120/momenco_ocelot/dbg_io.c,v retrieving revision 1.2 diff -u -r1.2 dbg_io.c --- arch/mips/gt64120/momenco_ocelot/dbg_io.c 29 Nov 2001 15:09:48 -0000 1.2 +++ arch/mips/gt64120/momenco_ocelot/dbg_io.c 26 Feb 2003 21:13:00 -0000 @@ -1,6 +1,6 @@ #include -#if defined(CONFIG_REMOTE_DEBUG) +#if defined(CONFIG_KGDB) #include /* For the serial port location and base baud */ Index: arch/mips/gt64120/momenco_ocelot/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/gt64120/momenco_ocelot/irq.c,v retrieving revision 1.10 diff -u -r1.10 irq.c --- arch/mips/gt64120/momenco_ocelot/irq.c 2 Dec 2002 00:27:45 -0000 1.10 +++ arch/mips/gt64120/momenco_ocelot/irq.c 26 Feb 2003 21:13:00 -0000 @@ -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 :-) */ Index: arch/mips/hp-lj/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/hp-lj/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- arch/mips/hp-lj/Makefile 2 Jan 2003 14:18:47 -0000 1.6 +++ arch/mips/hp-lj/Makefile 26 Feb 2003 21:13:00 -0000 @@ -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 Index: arch/mips/hp-lj/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/hp-lj/irq.c,v retrieving revision 1.3 diff -u -r1.3 irq.c --- arch/mips/hp-lj/irq.c 19 Dec 2001 00:03:00 -0000 1.3 +++ arch/mips/hp-lj/irq.c 26 Feb 2003 21:13:00 -0000 @@ -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; Index: arch/mips/hp-lj/setup.c =================================================================== RCS file: /home/cvs/linux/arch/mips/hp-lj/setup.c,v retrieving revision 1.6 diff -u -r1.6 setup.c --- arch/mips/hp-lj/setup.c 6 Aug 2002 00:08:55 -0000 1.6 +++ arch/mips/hp-lj/setup.c 26 Feb 2003 21:13:00 -0000 @@ -20,7 +20,7 @@ #include #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); Index: arch/mips/ite-boards/generic/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/ite-boards/generic/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- arch/mips/ite-boards/generic/Makefile 2 Jan 2003 14:18:47 -0000 1.9 +++ arch/mips/ite-boards/generic/Makefile 26 Feb 2003 21:13:00 -0000 @@ -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) Index: arch/mips/ite-boards/generic/dbg_io.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ite-boards/generic/dbg_io.c,v retrieving revision 1.2 diff -u -r1.2 dbg_io.c --- arch/mips/ite-boards/generic/dbg_io.c 18 Mar 2001 13:52:36 -0000 1.2 +++ arch/mips/ite-boards/generic/dbg_io.c 26 Feb 2003 21:13:00 -0000 @@ -1,7 +1,7 @@ #include -#ifdef CONFIG_REMOTE_DEBUG +#ifdef CONFIG_KGDB /* --- CONFIG --- */ Index: arch/mips/ite-boards/generic/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/ite-boards/generic/irq.c,v retrieving revision 1.12 diff -u -r1.12 irq.c --- arch/mips/ite-boards/generic/irq.c 2 Dec 2002 00:27:45 -0000 1.12 +++ arch/mips/ite-boards/generic/irq.c 26 Feb 2003 21:13:01 -0000 @@ -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(); Index: arch/mips/jmr3927/rbhma3100/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/jmr3927/rbhma3100/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- arch/mips/jmr3927/rbhma3100/Makefile 2 Jan 2003 14:18:47 -0000 1.6 +++ arch/mips/jmr3927/rbhma3100/Makefile 26 Feb 2003 21:13:01 -0000 @@ -4,7 +4,7 @@ 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_RUNTIME_DEBUG) += debug.o +obj-$(CONFIG_KGDB) += kgdb_io.o EXTRA_AFLAGS := $(CFLAGS) Index: arch/mips/jmr3927/rbhma3100/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/jmr3927/rbhma3100/irq.c,v retrieving revision 1.7 diff -u -r1.7 irq.c --- arch/mips/jmr3927/rbhma3100/irq.c 2 Dec 2002 00:27:46 -0000 1.7 +++ arch/mips/jmr3927/rbhma3100/irq.c 26 Feb 2003 21:13:01 -0000 @@ -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); Index: arch/mips/kernel/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/kernel/Makefile,v retrieving revision 1.64 diff -u -r1.64 Makefile --- arch/mips/kernel/Makefile 2 Jan 2003 14:18:47 -0000 1.64 +++ arch/mips/kernel/Makefile 26 Feb 2003 21:13:01 -0000 @@ -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 Index: arch/mips/kernel/gdb-stub.c =================================================================== RCS file: /home/cvs/linux/arch/mips/kernel/gdb-stub.c,v retrieving revision 1.21 diff -u -r1.21 gdb-stub.c --- arch/mips/kernel/gdb-stub.c 20 Feb 2003 18:19:31 -0000 1.21 +++ arch/mips/kernel/gdb-stub.c 26 Feb 2003 21:13:01 -0000 @@ -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(); Index: arch/mips/mips-boards/atlas/atlas_int.c =================================================================== RCS file: /home/cvs/linux/arch/mips/mips-boards/atlas/atlas_int.c,v retrieving revision 1.13 diff -u -r1.13 atlas_int.c --- arch/mips/mips-boards/atlas/atlas_int.c 4 Nov 2002 01:52:47 -0000 1.13 +++ arch/mips/mips-boards/atlas/atlas_int.c 26 Feb 2003 21:13:01 -0000 @@ -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(); Index: arch/mips/mips-boards/atlas/atlas_setup.c =================================================================== RCS file: /home/cvs/linux/arch/mips/mips-boards/atlas/atlas_setup.c,v retrieving revision 1.12 diff -u -r1.12 atlas_setup.c --- arch/mips/mips-boards/atlas/atlas_setup.c 6 Aug 2002 00:08:56 -0000 1.12 +++ arch/mips/mips-boards/atlas/atlas_setup.c 26 Feb 2003 21:13:01 -0000 @@ -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; Index: arch/mips/mips-boards/generic/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/mips-boards/generic/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- arch/mips/mips-boards/generic/Makefile 2 Jan 2003 14:18:48 -0000 1.14 +++ arch/mips/mips-boards/generic/Makefile 26 Feb 2003 21:13:01 -0000 @@ -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) Index: arch/mips/mips-boards/malta/malta_int.c =================================================================== RCS file: /home/cvs/linux/arch/mips/mips-boards/malta/malta_int.c,v retrieving revision 1.13 diff -u -r1.13 malta_int.c --- arch/mips/mips-boards/malta/malta_int.c 14 Feb 2003 18:48:11 -0000 1.13 +++ arch/mips/mips-boards/malta/malta_int.c 26 Feb 2003 21:13:01 -0000 @@ -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(); Index: arch/mips/mips-boards/malta/malta_setup.c =================================================================== RCS file: /home/cvs/linux/arch/mips/mips-boards/malta/malta_setup.c,v retrieving revision 1.15 diff -u -r1.15 malta_setup.c --- arch/mips/mips-boards/malta/malta_setup.c 14 Feb 2003 18:48:11 -0000 1.15 +++ arch/mips/mips-boards/malta/malta_setup.c 26 Feb 2003 21:13:01 -0000 @@ -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; Index: arch/mips/momentum/ocelot_c/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/momentum/ocelot_c/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- arch/mips/momentum/ocelot_c/Makefile 2 Jan 2003 14:18:48 -0000 1.4 +++ arch/mips/momentum/ocelot_c/Makefile 26 Feb 2003 21:13:01 -0000 @@ -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 Index: arch/mips/momentum/ocelot_c/dbg_io.c =================================================================== RCS file: /home/cvs/linux/arch/mips/momentum/ocelot_c/dbg_io.c,v retrieving revision 1.2 diff -u -r1.2 dbg_io.c --- arch/mips/momentum/ocelot_c/dbg_io.c 12 Nov 2002 19:40:25 -0000 1.2 +++ arch/mips/momentum/ocelot_c/dbg_io.c 26 Feb 2003 21:13:01 -0000 @@ -1,6 +1,6 @@ #include -#if defined(CONFIG_REMOTE_DEBUG) +#if defined(CONFIG_KGDB) #include /* For the serial port location and base baud */ Index: arch/mips/momentum/ocelot_c/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/momentum/ocelot_c/irq.c,v retrieving revision 1.3 diff -u -r1.3 irq.c --- arch/mips/momentum/ocelot_c/irq.c 2 Dec 2002 00:27:47 -0000 1.3 +++ arch/mips/momentum/ocelot_c/irq.c 26 Feb 2003 21:13:01 -0000 @@ -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 :-) */ Index: arch/mips/momentum/ocelot_g/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/momentum/ocelot_g/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- arch/mips/momentum/ocelot_g/Makefile 2 Jan 2003 14:18:48 -0000 1.5 +++ arch/mips/momentum/ocelot_g/Makefile 26 Feb 2003 21:13:01 -0000 @@ -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) Index: arch/mips/momentum/ocelot_g/dbg_io.c =================================================================== RCS file: /home/cvs/linux/arch/mips/momentum/ocelot_g/dbg_io.c,v retrieving revision 1.1 diff -u -r1.1 dbg_io.c --- arch/mips/momentum/ocelot_g/dbg_io.c 2 Sep 2002 16:10:57 -0000 1.1 +++ arch/mips/momentum/ocelot_g/dbg_io.c 26 Feb 2003 21:13:01 -0000 @@ -1,6 +1,6 @@ #include -#if defined(CONFIG_REMOTE_DEBUG) +#if defined(CONFIG_KGDB) #include /* For the serial port location and base baud */ Index: arch/mips/momentum/ocelot_g/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/momentum/ocelot_g/irq.c,v retrieving revision 1.3 diff -u -r1.3 irq.c --- arch/mips/momentum/ocelot_g/irq.c 2 Dec 2002 00:27:47 -0000 1.3 +++ arch/mips/momentum/ocelot_g/irq.c 26 Feb 2003 21:13:01 -0000 @@ -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 :-) */ Index: arch/mips/philips/nino/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/philips/nino/irq.c,v retrieving revision 1.13 diff -u -r1.13 irq.c --- arch/mips/philips/nino/irq.c 2 Dec 2002 00:27:48 -0000 1.13 +++ arch/mips/philips/nino/irq.c 26 Feb 2003 21:13:01 -0000 @@ -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); Index: arch/mips/sgi-ip22/ip22-setup.c =================================================================== RCS file: /home/cvs/linux/arch/mips/sgi-ip22/ip22-setup.c,v retrieving revision 1.19 diff -u -r1.19 ip22-setup.c --- arch/mips/sgi-ip22/ip22-setup.c 9 Jan 2003 13:25:06 -0000 1.19 +++ arch/mips/sgi-ip22/ip22-setup.c 26 Feb 2003 21:13:01 -0000 @@ -30,7 +30,7 @@ #include #include -#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; Index: arch/mips/sibyte/sb1250/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/sibyte/sb1250/irq.c,v retrieving revision 1.17 diff -u -r1.17 irq.c --- arch/mips/sibyte/sb1250/irq.c 7 Feb 2003 15:42:46 -0000 1.17 +++ arch/mips/sibyte/sb1250/irq.c 26 Feb 2003 21:13:01 -0000 @@ -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 @@ -414,4 +414,4 @@ if (!user_mode(regs)) set_async_breakpoint(regs->cp0_epc); } -#endif /* CONFIG_REMOTE_DEBUG */ +#endif /* CONFIG_KGDB */ Index: arch/mips/sibyte/sb1250/irq_handler.S =================================================================== RCS file: /home/cvs/linux/arch/mips/sibyte/sb1250/irq_handler.S,v retrieving revision 1.10 diff -u -r1.10 irq_handler.S --- arch/mips/sibyte/sb1250/irq_handler.S 22 Jan 2003 05:08:41 -0000 1.10 +++ arch/mips/sibyte/sb1250/irq_handler.S 26 Feb 2003 21:13:02 -0000 @@ -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 Index: arch/mips/sibyte/swarm/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/sibyte/swarm/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- arch/mips/sibyte/swarm/Makefile 7 Feb 2003 18:02:23 -0000 1.12 +++ arch/mips/sibyte/swarm/Makefile 26 Feb 2003 21:13:02 -0000 @@ -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 Index: arch/mips/vr4181/common/irq.c =================================================================== RCS file: /home/cvs/linux/arch/mips/vr4181/common/irq.c,v retrieving revision 1.6 diff -u -r1.6 irq.c --- arch/mips/vr4181/common/irq.c 6 Aug 2002 00:08:57 -0000 1.6 +++ arch/mips/vr4181/common/irq.c 26 Feb 2003 21:13:02 -0000 @@ -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(); Index: arch/mips/vr4181/osprey/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips/vr4181/osprey/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- arch/mips/vr4181/osprey/Makefile 2 Jan 2003 14:18:48 -0000 1.7 +++ arch/mips/vr4181/osprey/Makefile 26 Feb 2003 21:13:02 -0000 @@ -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 Index: arch/mips/vr41xx/common/icu.c =================================================================== RCS file: /home/cvs/linux/arch/mips/vr41xx/common/icu.c,v retrieving revision 1.3 diff -u -r1.3 icu.c --- arch/mips/vr41xx/common/icu.c 3 Oct 2002 16:57:50 -0000 1.3 +++ arch/mips/vr41xx/common/icu.c 26 Feb 2003 21:13:02 -0000 @@ -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(); Index: arch/mips64/Makefile =================================================================== RCS file: /home/cvs/linux/arch/mips64/Makefile,v retrieving revision 1.61 diff -u -r1.61 Makefile --- arch/mips64/Makefile 24 Jan 2003 01:47:05 -0000 1.61 +++ arch/mips64/Makefile 26 Feb 2003 21:13:02 -0000 @@ -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) Index: include/asm-mips/debug.h =================================================================== RCS file: /home/cvs/linux/include/asm-mips/debug.h,v retrieving revision 1.2 diff -u -r1.2 debug.h --- include/asm-mips/debug.h 6 Aug 2002 00:08:58 -0000 1.2 +++ include/asm-mips/debug.h 26 Feb 2003 21:13:19 -0000 @@ -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 /* - * 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 Index: include/asm-mips/ddb5xxx/ddb5477.h =================================================================== RCS file: /home/cvs/linux/include/asm-mips/ddb5xxx/ddb5477.h,v retrieving revision 1.6 diff -u -r1.6 ddb5477.h --- include/asm-mips/ddb5xxx/ddb5477.h 13 Dec 2002 00:33:42 -0000 1.6 +++ include/asm-mips/ddb5xxx/ddb5477.h 26 Feb 2003 21:13:20 -0000 @@ -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);