---

yaml --- r: 17963 b: refs/heads/master c: 01b8faa h: refs/heads/master i: 17961: d95db55 17959: 7e72cdf v: v3
git-mirror · Jan 12, 2006 · 851df4b · 851df4b
1 parent bc3ac72
commit 851df4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4839057cafc9a508ad5906857e9c1d8707c875e3
+refs/heads/master: 01b8faaef5d239aeabb1e712c5d9619f29e808dd
diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c
@@ -726,11 +726,9 @@ asmlinkage void __kprobes do_debug(struct pt_regs * regs,
 	info.si_signo = SIGTRAP;
 	info.si_errno = 0;
 	info.si_code = TRAP_BRKPT;
-	if (!user_mode(regs))
-		goto clear_dr7; 
+	info.si_addr = user_mode(regs) ? (void __user *)regs->rip : NULL;
+	force_sig_info(SIGTRAP, &info, tsk);
 
-	info.si_addr = (void __user *)regs->rip;
-	force_sig_info(SIGTRAP, &info, tsk);	
 clear_dr7:
 	set_debugreg(0UL, 7);
 	return;