diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 04:35:12 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 04:35:12 -0500 |
| commit | 44b0635481437140b0e29d6023f05e805d5e7620 (patch) | |
| tree | ff31986115075410d0479df307a6b9841976026c /include/linux/ftrace.h | |
| parent | 4ad476e11f94fd3724c6e272d8220e99cd222b27 (diff) | |
| parent | 57794a9d48b63e34acbe63282628c9f029603308 (diff) | |
Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Conflicts:
kernel/trace/trace_hw_branches.c
Diffstat (limited to 'include/linux/ftrace.h')
| -rw-r--r-- | include/linux/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 7840e718c6c7..5e302d636fc2 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -140,7 +140,7 @@ static inline int ftrace_disable_ftrace_graph_caller(void) { return 0; } | |||
| 140 | #endif | 140 | #endif |
| 141 | 141 | ||
| 142 | /** | 142 | /** |
| 143 | * ftrace_make_nop - convert code into top | 143 | * ftrace_make_nop - convert code into nop |
| 144 | * @mod: module structure if called by module load initialization | 144 | * @mod: module structure if called by module load initialization |
| 145 | * @rec: the mcount call site record | 145 | * @rec: the mcount call site record |
| 146 | * @addr: the address that the call site should be calling | 146 | * @addr: the address that the call site should be calling |