From 92e51938f5d005026ba4bb5b1fae5a86dc195b86 Mon Sep 17 00:00:00 2001 From: Andrew Vagin Date: Mon, 26 Sep 2011 19:55:32 +0400 Subject: perf: Fix counter of ftrace events Each event adds some points to its counters. By default it adds 1, and a number of points may be transmited in event's parameters. E.g. sched:sched_stat_runtime adds how long process has been running. But this functionality was broken by v2.6.31-rc5-392-gf413cdb and now the event's parameters doesn't affect on a number of points. TP_perf_assign isn't defined, so __perf_count(c) isn't executed and __count is always equal to 1. Signed-off-by: Andrew Vagin Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1317052535-1765247-2-git-send-email-avagin@openvz.org Signed-off-by: Ingo Molnar --- include/trace/ftrace.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 533c49f4804..769724944fc 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -711,6 +711,9 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call #undef __perf_count #define __perf_count(c) __count = (c) +#undef TP_perf_assign +#define TP_perf_assign(args...) args + #undef DECLARE_EVENT_CLASS #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ static notrace void \ -- cgit v1.2.3