Merge branch 'tracing/ftrace' into auto-ftrace-next

This commit is contained in:
Ingo Molnar 2008-07-14 15:58:35 +02:00
commit 6712e299b7
8 changed files with 54 additions and 10 deletions

View file

@ -89,6 +89,7 @@ void ftrace_enable_daemon(void);
/* totally disable ftrace - can not re-enable after this */
void ftrace_kill(void);
void ftrace_kill_atomic(void);
static inline void tracer_disable(void)
{