From 759bc9321aff5a4fd8dfa3a91065b950a491ce5e Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Thu, 23 Aug 2012 11:22:01 -0400
Subject: [PATCH] --- yaml --- r: 323747 b: refs/heads/master c:
 ff1a70e75fd005821ab5f2211312a8aa13bbf959 h: refs/heads/master i:   323745:
 2ebcb98414a661f374b887f80b33e2d0cd91f0a7   323743:
 3356d7f226cfb203139a5431e68bdada84d314f5 v: v3

---
 [refs]                                   | 2 +-
 trunk/tools/lib/traceevent/event-parse.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cd3725e10c7d..be4faed42d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bab57e994d6311298b4e3915d2c75296cd81638c
+refs/heads/master: ff1a70e75fd005821ab5f2211312a8aa13bbf959
diff --git a/trunk/tools/lib/traceevent/event-parse.h b/trunk/tools/lib/traceevent/event-parse.h
index 527df038a25f..863a0bbda7f1 100644
--- a/trunk/tools/lib/traceevent/event-parse.h
+++ b/trunk/tools/lib/traceevent/event-parse.h
@@ -49,7 +49,7 @@ struct pevent_record {
 	int			cpu;
 	int			ref_count;
 	int			locked;		/* Do not free, even if ref_count is zero */
-	void			*private;
+	void			*priv;
 #if DEBUG_RECORD
 	struct pevent_record	*prev;
 	struct pevent_record	*next;
@@ -106,7 +106,7 @@ struct plugin_option {
 	char				*plugin_alias;
 	char				*description;
 	char				*value;
-	void				*private;
+	void				*priv;
 	int				set;
 };