From: Andrew Morton Signed-off-by: Andrew Morton --- arch/i386/kernel/kgdb_stub.c | 14 +++++++------- arch/i386/kernel/traps.c | 10 +++++----- arch/i386/lib/kgdb_serial.c | 2 +- drivers/char/sysrq.c | 3 ++- include/asm-i386/kgdb.h | 4 ++-- include/linux/kgdb.h | 6 +++--- 6 files changed, 20 insertions(+), 19 deletions(-) diff -puN arch/i386/kernel/kgdb_stub.c~kgdb-rename-breakpoint arch/i386/kernel/kgdb_stub.c --- devel/arch/i386/kernel/kgdb_stub.c~kgdb-rename-breakpoint 2006-02-27 20:59:11.000000000 -0800 +++ devel-akpm/arch/i386/kernel/kgdb_stub.c 2006-02-27 20:59:11.000000000 -0800 @@ -39,7 +39,7 @@ * * Changes to allow auto initilization. All that is needed is that it * be linked with the kernel and a break point (int 3) be executed. - * The header file defines BREAKPOINT to allow one to do + * The header file defines KGDB_BREAKPOINT to allow one to do * this. It should also be possible, once the interrupt system is up, to * call putDebugChar("+"). Once this is done, the remote debugger should * get our attention by sending a ^C in a packet. George Anzinger @@ -54,8 +54,8 @@ * call to set_debug_traps() is necessary in order to allow any breakpoints * or error conditions to be properly intercepted and reported to gdb. * Two, a breakpoint needs to be generated to begin communication. This - * is most easily accomplished by a call to breakpoint(). Breakpoint() - * simulates a breakpoint by executing an int 3. + * is most easily accomplished by a call to kgdb_breakpoint(). + * kgdb_breakpoint() simulates a breakpoint by executing an int 3. * ************* * @@ -870,7 +870,7 @@ static struct hw_breakpoint { unsigned addr; } breakinfo[4]; -unsigned hw_breakpoint_status; +static unsigned hw_breakpoint_status; static void correct_hw_break(void) { @@ -1724,7 +1724,7 @@ once_again: /*to_gdb("Rebooting\n"); */ /* triplefault no return from here */ __asm__ __volatile__("lidt %0"::"m"(no_idt[0])); - BREAKPOINT; + KGDB_BREAKPOINT(); } putpacket(remcomOutBuffer); /* reply to the request */ } @@ -1832,7 +1832,7 @@ static void kgdb_console_write(struct co * early enough in boot up that we don't have the traps * set up yet, so... */ - breakpoint(); + kgdb_breakpoint(); } kgdb_gdb_message(s, count); } @@ -1879,7 +1879,7 @@ int __init kgdb_initial_break(char * str { kgdb_enabled = 1; if (*str == '\0'){ - breakpoint(); + kgdb_breakpoint(); return 1; } return 0; diff -puN arch/i386/kernel/traps.c~kgdb-rename-breakpoint arch/i386/kernel/traps.c --- devel/arch/i386/kernel/traps.c~kgdb-rename-breakpoint 2006-02-27 20:59:11.000000000 -0800 +++ devel-akpm/arch/i386/kernel/traps.c 2006-02-27 20:59:11.000000000 -0800 @@ -114,18 +114,18 @@ void set_intr_gate(unsigned int n, void #ifdef CONFIG_KGDB static void set_intr_usr_gate(unsigned int n, void *addr); /* - * Should be able to call this breakpoint() very early in + * Should be able to call this kgdb_breakpoint() very early in * bring up. Just hard code the call where needed. - * The breakpoint() code is here because set_?_gate() functions + * The kgdb_breakpoint() code is here because set_?_gate() functions * are local (static) to trap.c. They need be done only once, * but it does not hurt to do them over. */ -void breakpoint(void) +void kgdb_breakpoint(void) { set_intr_usr_gate(3,&int3); /* disable ints on trap */ set_intr_gate(1,&debug); set_intr_gate(14,&page_fault); - BREAKPOINT; + KGDB_BREAKPOINT(); } #define check_remote_debug(trapnr,signr,error_code,regs,after) \ @@ -428,7 +428,7 @@ void die(const char * str, struct pt_reg * will always be in kernel mode. */ if (user_mode(regs)) - BREAKPOINT; + KGDB_BREAKPOINT(); check_remote_debug(0,SIGTRAP,err,regs,) if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) != diff -puN arch/i386/lib/kgdb_serial.c~kgdb-rename-breakpoint arch/i386/lib/kgdb_serial.c --- devel/arch/i386/lib/kgdb_serial.c~kgdb-rename-breakpoint 2006-02-27 20:59:11.000000000 -0800 +++ devel-akpm/arch/i386/lib/kgdb_serial.c 2006-02-27 20:59:11.000000000 -0800 @@ -176,7 +176,7 @@ static irqreturn_t gdb_interrupt(int irq continue; if (chr == 3) { /* Ctrl-C means remote interrupt */ - BREAKPOINT; + KGDB_BREAKPOINT(); continue; } diff -puN drivers/char/sysrq.c~kgdb-rename-breakpoint drivers/char/sysrq.c --- devel/drivers/char/sysrq.c~kgdb-rename-breakpoint 2006-02-27 20:59:11.000000000 -0800 +++ devel-akpm/drivers/char/sysrq.c 2006-02-27 20:59:11.000000000 -0800 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -46,7 +47,7 @@ int sysrq_enabled = 1; static void kgdb_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty) { printk("kgdb sysrq\n"); - breakpoint(); + kgdb_breakpoint(); } static struct sysrq_key_op kgdb_op = { diff -puN include/asm-i386/kgdb.h~kgdb-rename-breakpoint include/asm-i386/kgdb.h --- devel/include/asm-i386/kgdb.h~kgdb-rename-breakpoint 2006-02-27 20:59:11.000000000 -0800 +++ devel-akpm/include/asm-i386/kgdb.h 2006-02-27 20:59:11.000000000 -0800 @@ -3,9 +3,9 @@ struct pt_regs; -extern void breakpoint(void); +extern void kgdb_breakpoint(void); -#define BREAKPOINT asm(" int $3") +#define KGDB_BREAKPOINT() asm(" int $3") /* * GDB debug stub (or any debug stub) can point the 'linux_debug_hook' diff -puN include/linux/kgdb.h~kgdb-rename-breakpoint include/linux/kgdb.h --- devel/include/linux/kgdb.h~kgdb-rename-breakpoint 2006-02-27 20:59:11.000000000 -0800 +++ devel-akpm/include/linux/kgdb.h 2006-02-27 20:59:11.000000000 -0800 @@ -1,20 +1,20 @@ #ifndef KGDB_H_INCLUDED #define KGDB_H_INCLUDED -#if defined(CONFIG_X86_32) && defined (CONFIG_KGDB) && !defined(__ASSEMBLY__) +#if defined(CONFIG_X86_32) && defined(CONFIG_KGDB) && !defined(__ASSEMBLY__) #include #else #define kgdb_enabled 0 #define kgdb_irq 0 -#define BREAKPOINT do {} while (0) +#define KGDB_BREAKPOINT() do {} while (0) #define kgdb_ts(data0,data1) static inline int in_kgdb(struct pt_regs *regs) { return 0; } static inline void kgdb_handle_exception(int trapno, int signo, int err_code, struct pt_regs *regs) { } -#define breakpoint +#define kgdb_breakpoint() do { } while (0) #endif extern struct task_struct *kgdb_get_idle(int cpu); _