diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-20 18:26:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-20 18:26:48 +0200 |
commit | d4c4038343510d83727ea922de4435996c26c0c8 (patch) | |
tree | ec735b5133ddb0c46211c87a2a7ee66c71a6d433 /include | |
parent | 3daeb4da9a0b056bdc4af003e5605c1da4c0b068 (diff) | |
parent | 71e308a239c098673570d0b417d42262bb535909 (diff) |
Merge branch 'tip/tracing/urgent-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ftrace.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 39b95c56587..dc3b1328aae 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -362,6 +362,7 @@ struct ftrace_ret_stack { unsigned long func; unsigned long long calltime; unsigned long long subtime; + unsigned long fp; }; /* @@ -372,7 +373,8 @@ struct ftrace_ret_stack { extern void return_to_handler(void); extern int -ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth); +ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth, + unsigned long frame_pointer); /* * Sometimes we don't want to trace a function with the function |