From 86f98d8179465055d94804e2c327751af5221c82 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Tue, 28 Jul 2009 19:47:23 -0400
Subject: [PATCH] --- yaml --- r: 156088 b: refs/heads/master c:
 ec30c5f3a18722f8fcf8c83146a10b03ac4d9ff1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1ac39198bd6b..a7b7aabb0dd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a09c9cf78344d18e2438c3b87363b949629fa3
+refs/heads/master: ec30c5f3a18722f8fcf8c83146a10b03ac4d9ff1
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 16b5739c516a..0540948e29ab 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -694,7 +694,7 @@ int __kprobes register_kprobe(struct kprobe *p)
 	p->addr = addr;
 
 	preempt_disable();
-	if (!__kernel_text_address((unsigned long) p->addr) ||
+	if (!kernel_text_address((unsigned long) p->addr) ||
 	    in_kprobes_functions((unsigned long) p->addr)) {
 		preempt_enable();
 		return -EINVAL;