From be6084cffa2e8e45141b6caf10137deabfcf6152 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Tue, 6 Jan 2009 14:41:46 -0800
Subject: [PATCH] --- yaml --- r: 126337 b: refs/heads/master c:
 bc2f70151fe7a117dbe8347edc5a877e749572a3 h: refs/heads/master i:   126335:
 7c9003f37870c8e3b51263a43f2a23757ffb91aa v: v3

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

diff --git a/[refs] b/[refs]
index 6376915de88b..940b272f3bbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51e911e27690aecea01d4fe9cb22d38bdd0748ac
+refs/heads/master: bc2f70151fe7a117dbe8347edc5a877e749572a3
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 9f8a3f25259a..3afd354c46f1 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -634,7 +634,7 @@ static int __kprobes __register_kprobe(struct kprobe *p,
 		 * avoid incrementing the module refcount, so as to allow
 		 * unloading of self probing modules.
 		 */
-		if (calling_mod && calling_mod != probed_mod) {
+		if (calling_mod != probed_mod) {
 			if (unlikely(!try_module_get(probed_mod))) {
 				preempt_enable();
 				return -EINVAL;