diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:57 -0400 |
| commit | c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8 (patch) | |
| tree | 3f44aa013d31d34951e9610e79ff14c1148ad6ac /include/trace/ftrace.h | |
| parent | 7be7923633a142402266d642ccebf74f556a649b (diff) | |
| parent | 018378c55b03f88ff513aba4e0e93b8d4a9cf241 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'include/trace/ftrace.h')
| -rw-r--r-- | include/trace/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 5a64905d7278..fc013a8201e9 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
| @@ -705,7 +705,7 @@ perf_trace_##call(void *__data, proto) \ | |||
| 705 | int __data_size; \ | 705 | int __data_size; \ |
| 706 | int rctx; \ | 706 | int rctx; \ |
| 707 | \ | 707 | \ |
| 708 | perf_fetch_caller_regs(&__regs, 1); \ | 708 | perf_fetch_caller_regs(&__regs); \ |
| 709 | \ | 709 | \ |
| 710 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ | 710 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ |
| 711 | __entry_size = ALIGN(__data_size + sizeof(*entry) + sizeof(u32),\ | 711 | __entry_size = ALIGN(__data_size + sizeof(*entry) + sizeof(u32),\ |