From f7ca4f60ad8cfaaf61f584df7dd68bba747eff60 Mon Sep 17 00:00:00 2001
From: Andrew Vagin <avagin@openvz.org>
Date: Mon, 26 Sep 2011 19:55:32 +0400
Subject: [PATCH] --- yaml --- r: 269026 b: refs/heads/master c:
 92e51938f5d005026ba4bb5b1fae5a86dc195b86 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/trace/ftrace.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1d5d730c4cb7..495eec4c2cb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87ffef79ab7562ca4a1f6f22ed7ddef1c434bc24
+refs/heads/master: 92e51938f5d005026ba4bb5b1fae5a86dc195b86
diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h
index 533c49f48047..769724944fc6 100644
--- a/trunk/include/trace/ftrace.h
+++ b/trunk/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							\