From 892786c2100ca6dc3f876e68572db8e5301876a6 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 19 Sep 2012 16:36:01 +0200
Subject: [PATCH] --- yaml --- r: 334759 b: refs/heads/master c:
 e97f65a17deafacc360a4cb75ae944897ecea6d7 h: refs/heads/master i:   334757:
 eae6aba0b8269ad8cdb9fea6f8eeb3f07007fe6b   334755:
 99ed20354fb10089e0b830949950d4f2e65a5b9c   334751:
 2ffe32ed2feff79baf5715b6dc262be725f55dce v: v3

---
 [refs]                        |  2 +-
 trunk/kernel/events/uprobes.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index bbfc91b62e95..c2c9c4bbdb74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e40cfce626a5537994058ee9a940dcfdc0f68ef0
+refs/heads/master: e97f65a17deafacc360a4cb75ae944897ecea6d7
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index 8d182bdecc2e..a4453d1c8199 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -321,17 +321,6 @@ static int is_swbp_at_addr(struct mm_struct *mm, unsigned long vaddr)
  */
 int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)
 {
-	int result;
-	/*
-	 * See the comment near uprobes_hash().
-	 */
-	result = is_swbp_at_addr(mm, vaddr);
-	if (result == 1)
-		return 0;
-
-	if (result)
-		return result;
-
 	return write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN);
 }