From: Andrew Morton Signed-off-by: Andrew Morton --- i386/kernel/kgdb_stub.c | 0 i386/lib/kgdb_serial.c | 0 arch/i386/Kconfig.kgdb | 13 ------------- arch/i386/kernel/traps.c | 3 +-- drivers/char/sysrq.c | 2 +- linux/kgdb.h | 0 6 files changed, 2 insertions(+), 16 deletions(-) diff -puN arch/i386/Kconfig.kgdb~kgdb-remove-KGDB_SYSRQ arch/i386/Kconfig.kgdb --- devel/arch/i386/Kconfig.kgdb~kgdb-remove-KGDB_SYSRQ 2006-02-27 03:37:55.000000000 -0800 +++ devel-akpm/arch/i386/Kconfig.kgdb 2006-02-27 03:37:55.000000000 -0800 @@ -64,16 +64,3 @@ 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_SYSRQ - bool "Turn on SysRq 'G' command to do a break?" - depends on KGDB - default y - help - This option includes an option in the SysRq code that allows - you to enter SysRq G which generates a breakpoint to the KGDB - stub. This will work if the keyboard is alive and can - interrupt the system. Because of constraints on when the - serial port interrupt can be enabled, this code may allow you - to interrupt the system before the serial port control C is - available. Just say yes here. - diff -puN arch/i386/kernel/traps.c~kgdb-remove-KGDB_SYSRQ arch/i386/kernel/traps.c --- devel/arch/i386/kernel/traps.c~kgdb-remove-KGDB_SYSRQ 2006-02-27 03:37:55.000000000 -0800 +++ devel-akpm/arch/i386/kernel/traps.c 2006-02-27 03:37:55.000000000 -0800 @@ -125,8 +125,7 @@ void breakpoint(void) set_intr_usr_gate(3,&int3); /* disable ints on trap */ set_intr_gate(1,&debug); set_intr_gate(14,&page_fault); - - BREAKPOINT; + BREAKPOINT; } #define check_remote_debug(trapnr,signr,error_code,regs,after) \ diff -puN drivers/char/sysrq.c~kgdb-remove-KGDB_SYSRQ drivers/char/sysrq.c --- devel/drivers/char/sysrq.c~kgdb-remove-KGDB_SYSRQ 2006-02-27 03:37:55.000000000 -0800 +++ devel-akpm/drivers/char/sysrq.c 2006-02-27 03:38:38.000000000 -0800 @@ -42,7 +42,7 @@ /* Whether we react on sysrq keys or just ignore them */ int sysrq_enabled = 1; -#ifdef CONFIG_KGDB_SYSRQ +#ifdef CONFIG_KGDB static void kgdb_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty) { printk("kgdb sysrq\n"); diff -puN arch/i386/kernel/kgdb_stub.c~kgdb-remove-KGDB_SYSRQ arch/i386/kernel/kgdb_stub.c diff -puN arch/i386/lib/kgdb_serial.c~kgdb-remove-KGDB_SYSRQ arch/i386/lib/kgdb_serial.c diff -puN include/linux/kgdb.h~kgdb-remove-KGDB_SYSRQ include/linux/kgdb.h _