Commit-ID: 96de37b62ca525cd77d2e85aea1472846ee31c4d Gitweb: http://git.kernel.org/tip/96de37b62ca525cd77d2e85aea1472846ee31c4d Author: Steven Rostedt <srostedt@xxxxxxxxxx> AuthorDate: Sat, 7 Jan 2012 17:26:49 -0500 Committer: Steven Rostedt <rostedt@xxxxxxxxxxx> CommitDate: Sat, 7 Jan 2012 17:26:49 -0500 tracing: Fix compile error when static ftrace is enabled The stack tracer uses the call ftrace_set_early_filter() function to allow the stack tracer to pick its own functions on boot. But this function is not defined if dynamic ftrace is not set. This causes a compiler error when stack tracer is enabled and dynamic ftrace is not. Reported-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- include/linux/ftrace.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 41df6f5..028e26f 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -339,6 +339,7 @@ static inline int ftrace_text_reserved(void *start, void *end) * functions may still be called. Use a macro instead of inline. */ #define ftrace_regex_open(ops, flag, inod, file) ({ -ENODEV; }) +#define ftrace_set_early_filter(ops, buf, enable) do { } while (0) static inline ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos) { return -ENODEV; } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html