---

yaml --- r: 323628 b: refs/heads/master c: 4dc9367 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · ba77027 · ba77027
1 parent e1f271d
commit ba77027
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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