diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-11-13 19:21:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-11-13 19:21:32 +0100 |
| commit | 84e53ff77cb1e005f49966cd6789109d84acc9e2 (patch) | |
| tree | 4d1426dc45c8af73e78279bd737eb1dd63909f11 /include/trace/ftrace.h | |
| parent | ccf59d8da119ab03dcbdf95fb5e5adcef6ba51f2 (diff) | |
| parent | 7bcfaf54f591a0775254c4ea679faf615152ee3a (diff) | |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steven Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/trace/ftrace.h')
| -rw-r--r-- | include/trace/ftrace.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index a763888a36f9..698f2a890322 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -545,8 +545,7 @@ ftrace_raw_event_##call(void *__data, proto) \ { assign; } \ \ if (!filter_current_check_discard(buffer, event_call, entry, event)) \ - trace_nowake_buffer_unlock_commit(buffer, \ - event, irq_flags, pc); \ + trace_buffer_unlock_commit(buffer, event, irq_flags, pc); \ } /* * The ftrace_test_probe is compiled out, it is only here as a build time check |