diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 20:12:01 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 20:12:01 +0300 |
| commit | c478f8786973d6d7552c652ddad3f6fd86b5af28 (patch) | |
| tree | 39967f4bb9a35d626584bd46f1acd916c6b5278d /include/linux/ftrace.h | |
| parent | 843adf2379c18ed9a1b7493ee208bfd5512732e0 (diff) | |
| parent | 4377245aa93b65b6597e4b7bb460fb9abc48b56b (diff) | |
| download | linux-c478f8786973d6d7552c652ddad3f6fd86b5af28.tar.xz | |
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/linux/ftrace.h')
| -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 { /* asm/ftrace.h must be defined for archs supporting dynamic ftrace */ #include <asm/ftrace.h> +int ftrace_arch_code_modify_prepare(void); +int ftrace_arch_code_modify_post_process(void); + struct seq_file; struct ftrace_probe_ops { |