Messages in this thread Patch in this message | | | Date | Tue, 21 Aug 2012 08:12:38 -0700 | From | tip-bot for Steven Rostedt <> | Subject | [tip:perf/core] ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE |
| |
Commit-ID: 4dc936769e8a6382a4cc12375e8a4daa2b829fda Gitweb: http://git.kernel.org/tip/4dc936769e8a6382a4cc12375e8a4daa2b829fda Author: Steven Rostedt <srostedt@redhat.com> AuthorDate: Wed, 6 Jun 2012 13:45:31 -0400 Committer: Steven Rostedt <rostedt@goodmis.org> CommitDate: Tue, 31 Jul 2012 10:29:57 -0400
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> --- 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 3e71112..a52f2f4 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
| |