lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

Browse Source 
Conflicts:
	include/linux/ftrace.h
	kernel/trace/ftrace.c
This commit is contained in:
Ingo Molnar
2009-02-22 18:12:01 +01:00
parent 843adf2379 4377245aa9
commit c478f87869
8 changed files with 130 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/ftrace.h
View File

@ -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 {