From 851df4b6e8a9255f464ca4ce923f4358f35a35f3 Mon Sep 17 00:00:00 2001
From: John Blackwood <john.blackwood@ccur.com>
Date: Wed, 11 Jan 2006 22:44:15 +0100
Subject: [PATCH] --- yaml --- r: 17963 b: refs/heads/master c:
 01b8faaef5d239aeabb1e712c5d9619f29e808dd h: refs/heads/master i:   17961:
 d95db55f0f8286e4be66b8a1259a5d96d83dc5cc   17959:
 7e72cdf25876f29390811d238d5e4884bc7506ca v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/traps.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2305a5920708..41e1dba9d075 100644
--- 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
index 1a9094dab682..8d21d87b0d77 100644
--- 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;