diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-23 03:10:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-23 03:10:29 -0400 |
| commit | 3a01736e70a7d629140695ba46a901266b4460cc (patch) | |
| tree | 49ff8ce1e7c6a267f0ce84b5daddbe6666bc4253 /include/linux/ftrace.h | |
| parent | 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb (diff) | |
| parent | 24a461d537f49f9da6533d83100999ea08c6c755 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'include/linux/ftrace.h')
| -rw-r--r-- | include/linux/ftrace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 41e46330d9be..dcd6a7c3a435 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | /* | ||
| 2 | * Ftrace header. For implementation details beyond the random comments | ||
| 3 | * scattered below, see: Documentation/trace/ftrace-design.txt | ||
| 4 | */ | ||
| 5 | |||
| 1 | #ifndef _LINUX_FTRACE_H | 6 | #ifndef _LINUX_FTRACE_H |
| 2 | #define _LINUX_FTRACE_H | 7 | #define _LINUX_FTRACE_H |
| 3 | 8 | ||