diff options
| author |   Steven Rostedt <srostedt@redhat.com> | 2012-06-06 13:45:31 -0400 |
|---|---|---|
| committer |   Steven Rostedt <rostedt@goodmis.org> | 2012-07-31 10:29:57 -0400 |
| commit | 4dc936769e8a6382a4cc12375e8a4daa2b829fda (patch) | |
| tree | 402e75bf6edb5761ea4c2312778d137c0e0dcf44 | |
| parent | kprobes: Move locks into appropriate functions (diff) | |
| download | linux-dev-4dc936769e8a6382a4cc12375e8a4daa2b829fda.tar.xz linux-dev-4dc936769e8a6382a4cc12375e8a4daa2b829fda.zip | |
ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE
When CONFIG_DYNAMIC_FTRACE is not set, ftrace_location() is not defined.
If a user (like kprobes) references this function, it will break
the compile when CONFIG_DYNAMIC_FTRACE is not set.
Add ftrace_location() as a nop (return 0) when DYNAMIC_FTRACE
is not defined.
Link: http://lkml.kernel.org/r/20120612225426.961092717@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | include/linux/ftrace.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 3e711122f66c..a52f2f4fe030 100644 --- a/include/linux/ftrace.h +++ b/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 |