From ba770271f5afe554a1995daee1e42467c563e28f Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 6 Jun 2012 13:45:31 -0400
Subject: [PATCH] --- yaml --- r: 323628 b: refs/heads/master c:
 4dc936769e8a6382a4cc12375e8a4daa2b829fda h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 74cda5cb936a..958622c959fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25764288d8dc4792f0f487baf043ccfee5d8c2ba
+refs/heads/master: 4dc936769e8a6382a4cc12375e8a4daa2b829fda
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 3e711122f66c..a52f2f4fe030 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -520,7 +520,7 @@ extern int skip_trace(unsigned long ip);
 
 extern void ftrace_disable_daemon(void);
 extern void ftrace_enable_daemon(void);
-#else
+#else /* CONFIG_DYNAMIC_FTRACE */
 static inline int skip_trace(unsigned long ip) { return 0; }
 static inline int ftrace_force_update(void) { return 0; }
 static inline void ftrace_disable_daemon(void) { }
@@ -538,6 +538,10 @@ static inline int ftrace_text_reserved(void *start, void *end)
 {
 	return 0;
 }
+static inline unsigned long ftrace_location(unsigned long ip)
+{
+	return 0;
+}
 
 /*
  * Again users of functions that have ftrace_ops may not