Kgr wants to test whether ftrace is OK with patching. If not, we just bail out and will not initialize at all.
Signed-off-by: Jiri Slaby <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> --- include/linux/ftrace.h | 3 +++ kernel/trace/trace.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index c142816c2801..7ba30d4b4909 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -140,6 +140,8 @@ enum ftrace_tracing_type_t { /* Current tracing type, default is FTRACE_TYPE_ENTER */ extern enum ftrace_tracing_type_t ftrace_tracing_type; +extern int ftrace_is_dead(void); + /** * ftrace_stop - stop function tracer. * @@ -241,6 +243,7 @@ static inline int ftrace_nr_registered_ops(void) return 0; } static inline void clear_ftrace_function(void) { } +static inline int ftrace_is_dead(void) { return 0; } static inline void ftrace_kill(void) { } static inline void ftrace_stop(void) { } static inline void ftrace_start(void) { } diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 9258f5a815db..0d96b8990a97 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -824,7 +824,6 @@ static inline int ftrace_trace_task(struct task_struct *task) return test_tsk_trace_trace(task); } -extern int ftrace_is_dead(void); int ftrace_create_function_files(struct trace_array *tr, struct dentry *parent); void ftrace_destroy_function_files(struct trace_array *tr); @@ -837,7 +836,6 @@ static inline int ftrace_trace_task(struct task_struct *task) { return 1; } -static inline int ftrace_is_dead(void) { return 0; } static inline int ftrace_create_function_files(struct trace_array *tr, struct dentry *parent) -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
