diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 12:12:01 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 12:12:01 -0500 |
| commit | c478f8786973d6d7552c652ddad3f6fd86b5af28 (patch) | |
| tree | 39967f4bb9a35d626584bd46f1acd916c6b5278d /include | |
| parent | 843adf2379c18ed9a1b7493ee208bfd5512732e0 (diff) | |
| parent | 4377245aa93b65b6597e4b7bb460fb9abc48b56b (diff) | |
Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Conflicts:
include/linux/ftrace.h
kernel/trace/ftrace.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 915f4723fc8b..847bb3c48dd0 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -106,6 +106,9 @@ struct ftrace_func_command { | |||
| 106 | /* asm/ftrace.h must be defined for archs supporting dynamic ftrace */ | 106 | /* asm/ftrace.h must be defined for archs supporting dynamic ftrace */ |
| 107 | #include <asm/ftrace.h> | 107 | #include <asm/ftrace.h> |
| 108 | 108 | ||
| 109 | int ftrace_arch_code_modify_prepare(void); | ||
| 110 | int ftrace_arch_code_modify_post_process(void); | ||
| 111 | |||
| 109 | struct seq_file; | 112 | struct seq_file; |
| 110 | 113 | ||
| 111 | struct ftrace_probe_ops { | 114 | struct ftrace_probe_ops { |