diff -urpN -X /home/fletch/.diff.exclude 201-kprobes/arch/i386/kernel/traps.c 202-kgdb_fixes/arch/i386/kernel/traps.c
--- 201-kprobes/arch/i386/kernel/traps.c	Sat May 10 18:48:27 2003
+++ 202-kgdb_fixes/arch/i386/kernel/traps.c	Sat May 10 18:48:28 2003
@@ -414,7 +414,7 @@ gp_in_vm86:
 
 gp_in_kernel:
 	if (!fixup_exception(regs)) {
-		CHK_REMOTE_DEBUG(13,SIGSEGV,error_code,regs,);
+		CHK_REMOTE_DEBUG(13,SIGSEGV,error_code,regs,)
 		die("general protection fault", regs, error_code);
 	}
 }
@@ -528,6 +528,7 @@ asmlinkage int do_int3(struct pt_regs *r
 	/* This is an interrupt gate, because kprobes wants interrupts
            disabled.  Normal trap handlers don't. */
 	restore_interrupts(regs);
+	CHK_REMOTE_DEBUG(3,SIGTRAP,error_code,regs,return 0)
 	do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
 	return 0;
 }