From 8539c948e2703ddb506c1bfed70b6af68aa6edf8 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Tue, 30 Jun 2009 17:08:09 -0400
Subject: [PATCH] --- yaml --- r: 155170 b: refs/heads/master c:
 4a2bb6fcc80e6330ca2f2393e98605052cc7780b h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/kprobes.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 483be72ff0e6..0a39c346ac60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 238a24f626628cb16a3015f332d649f08246ca89
+refs/heads/master: 4a2bb6fcc80e6330ca2f2393e98605052cc7780b
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index c0fa54b276d9..16b5739c516a 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -237,13 +237,9 @@ static int __kprobes collect_garbage_slots(void)
 {
 	struct kprobe_insn_page *kip;
 	struct hlist_node *pos, *next;
-	int safety;
 
 	/* Ensure no-one is preepmted on the garbages */
-	mutex_unlock(&kprobe_insn_mutex);
-	safety = check_safety();
-	mutex_lock(&kprobe_insn_mutex);
-	if (safety != 0)
+	if (check_safety())
 		return -EAGAIN;
 
 	hlist_for_each_entry_safe(kip, pos, next, &kprobe_insn_pages, hlist) {