From ddbb29992e85056e09a2f8432b1b9d2e98fd08f1 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Sun, 30 Dec 2012 15:21:22 +0100
Subject: [PATCH] --- yaml --- r: 350088 b: refs/heads/master c:
 cf31ec3f7fece93f3fce3ee5964e27857141ea47 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/uprobes.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index abde634fcc03..036b3068731a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da1816b1caeccdff04531e763bb35d7caa3ed19f
+refs/heads/master: cf31ec3f7fece93f3fce3ee5964e27857141ea47
diff --git a/trunk/arch/x86/kernel/uprobes.c b/trunk/arch/x86/kernel/uprobes.c
index c71025b67462..4e33a35d659e 100644
--- a/trunk/arch/x86/kernel/uprobes.c
+++ b/trunk/arch/x86/kernel/uprobes.c
@@ -680,8 +680,11 @@ static bool __skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
 		if (auprobe->insn[i] == 0x66)
 			continue;
 
-		if (auprobe->insn[i] == 0x90)
+		if (auprobe->insn[i] == 0x90) {
+			regs->ip = uprobe_get_swbp_addr(regs);
+			regs->ip += i + 1;
 			return true;
+		}
 
 		break;
 	}