diff options
| author | Avi Kivity <avi@redhat.com> | 2010-04-19 12:52:53 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:17:58 +0300 |
| commit | 9beeaa2d689842f7760aa16c512e6bb8182d38b6 (patch) | |
| tree | 62cea0772127c4b1c0b476e46dec6830d36809c1 /include/trace | |
| parent | 3246af0ece6c61689847417977733f0b12dc4b6f (diff) | |
| parent | a1645ce12adb6c9cc9e19d7695466204e3f017fe (diff) | |
| download | linux-3.10-9beeaa2d689842f7760aa16c512e6bb8182d38b6.tar.gz linux-3.10-9beeaa2d689842f7760aa16c512e6bb8182d38b6.tar.bz2 linux-3.10-9beeaa2d689842f7760aa16c512e6bb8182d38b6.zip | |
Merge branch 'perf'
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/ftrace.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index ea6f9d4a20e..882c64832ff 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -758,13 +758,12 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ static notrace void \ perf_trace_templ_##call(struct ftrace_event_call *event_call, \ - proto) \ + struct pt_regs *__regs, proto) \ { \ struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ struct ftrace_raw_##call *entry; \ u64 __addr = 0, __count = 1; \ unsigned long irq_flags; \ - struct pt_regs *__regs; \ int __entry_size; \ int __data_size; \ int rctx; \ @@ -785,20 +784,22 @@ perf_trace_templ_##call(struct ftrace_event_call *event_call, \ \ { assign; } \ \ - __regs = &__get_cpu_var(perf_trace_regs); \ - perf_fetch_caller_regs(__regs, 2); \ - \ perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ __count, irq_flags, __regs); \ } #undef DEFINE_EVENT -#define DEFINE_EVENT(template, call, proto, args) \ -static notrace void perf_trace_##call(proto) \ -{ \ - struct ftrace_event_call *event_call = &event_##call; \ - \ - perf_trace_templ_##template(event_call, args); \ +#define DEFINE_EVENT(template, call, proto, args) \ +static notrace void perf_trace_##call(proto) \ +{ \ + struct ftrace_event_call *event_call = &event_##call; \ + struct pt_regs *__regs = &get_cpu_var(perf_trace_regs); \ + \ + perf_fetch_caller_regs(__regs, 1); \ + \ + perf_trace_templ_##template(event_call, __regs, args); \ + \ + put_cpu_var(perf_trace_regs); \ } #undef DEFINE_EVENT_PRINT |