diff --git a/[refs] b/[refs]
index 131d8fbb9b0f..07c4ee9e04f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5323ce71e4b4e1f188ebbc0cc7776885ea6c75fb
+refs/heads/master: c1914a0936f79ed0236f670122e06e36e4d332ee
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index 3ccdb29ee8d6..ec78152e32e9 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -693,7 +693,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm,
 			return ret;
 
 		if (is_swbp_insn((uprobe_opcode_t *)uprobe->arch.insn))
-			return -EEXIST;
+			return -ENOTSUPP;
 
 		ret = arch_uprobe_analyze_insn(&uprobe->arch, mm, addr);
 		if (ret)