diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 09:58:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 09:58:35 -0400 |
| commit | 6712e299b7dc78aa4971b85e803435ee6d49a9dd (patch) | |
| tree | b3d17a2d068737ec07727b28e93c7d374c27721b /include/linux | |
| parent | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (diff) | |
| parent | b2613e370dbeb69edbff989382fa54f2395aa471 (diff) | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | 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 3121b95443d9..f368d041e02d 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -89,6 +89,7 @@ void ftrace_enable_daemon(void); | |||
| 89 | 89 | ||
| 90 | /* totally disable ftrace - can not re-enable after this */ | 90 | /* totally disable ftrace - can not re-enable after this */ |
| 91 | void ftrace_kill(void); | 91 | void ftrace_kill(void); |
| 92 | void ftrace_kill_atomic(void); | ||
| 92 | 93 | ||
| 93 | static inline void tracer_disable(void) | 94 | static inline void tracer_disable(void) |
| 94 | { | 95 | { |