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;
 	}