From 715a6e18387e345fbb204b0724aa6dc61fbcaf0f Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Fri, 9 Jan 2009 11:29:42 +0800
Subject: [PATCH] --- yaml --- r: 140622 b: refs/heads/master c:
 f00012074b1a1a67d9c8603617bbbab267347ca6 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ftrace.h | 4 ++++
 trunk/kernel/trace/ftrace.c  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dced86b719e1..a0b3b5c107fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25aac9dc7c8c73798c1be8aa36141f980d32579e
+refs/heads/master: f00012074b1a1a67d9c8603617bbbab267347ca6
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 677432b9cb7e..054721487574 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -126,6 +126,10 @@ extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);
+
+#ifndef FTRACE_ADDR
+#define FTRACE_ADDR ((unsigned long)ftrace_caller)
+#endif
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 extern void ftrace_graph_caller(void);
 extern int ftrace_enable_ftrace_graph_caller(void);
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 76bb884b6e16..9f536108d3f3 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -455,7 +455,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
 	unsigned long ip, fl;
 	unsigned long ftrace_addr;
 
-	ftrace_addr = (unsigned long)ftrace_caller;
+	ftrace_addr = (unsigned long)FTRACE_ADDR;
 
 	ip = rec->ip;