Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc

[~andy/linux] / kernel / trace / trace.h

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 4c7540ad5dcb43c2250f13b12785ff6ad5c4dd64..092e1f8d18dc88757280362b8ae77b97d890c3ad 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -579,11 +579,13 @@ static inline int ftrace_trace_task(struct task_struct *task)
 
        return test_tsk_trace_trace(task);
 }
+extern int ftrace_is_dead(void);
 #else
 static inline int ftrace_trace_task(struct task_struct *task)
 {
        return 1;
 }
+static inline int ftrace_is_dead(void) { return 0; }
 #endif
 
 /*