From a564cca6c75c702b0868b85f4cb72264bd515239 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Thu, 29 Nov 2012 15:38:29 +0900
Subject: [PATCH] --- yaml --- r: 349887 b: refs/heads/master c:
 2cfda562da7b0b1e0575507ef3efe782d4e218e4 h: refs/heads/master i:   349885:
 81169a1ec502ccc8750e9e8e525240f5ed0499ab   349883:
 f82c24a851bce1c43373866cab2c7486a858bb7a   349879:
 08da13c26f19abf52667a44532b273ce0876b929   349871:
 3f801a77fca6c18133d9c06ca81f04a0d7a271dc   349855:
 da5fd170b83004d303e376a82218eae19207a24a   349823:
 74afec141bca8bdcdd832419c1abde657c6f3ccf v: v3

---
 [refs]                         | 2 +-
 trunk/tools/perf/util/evlist.c | 1 -
 trunk/tools/perf/util/evsel.c  | 1 +
 trunk/tools/perf/util/evsel.h  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d1c0cf9d25c7..4cfbcc7922f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fa9041bbaa7a79a67d568b9c9f947db2f23d091
+refs/heads/master: 2cfda562da7b0b1e0575507ef3efe782d4e218e4
diff --git a/trunk/tools/perf/util/evlist.c b/trunk/tools/perf/util/evlist.c
index 705293489e3c..90db2a14e4bb 100644
--- a/trunk/tools/perf/util/evlist.c
+++ b/trunk/tools/perf/util/evlist.c
@@ -111,7 +111,6 @@ void __perf_evlist__set_leader(struct list_head *list)
 	struct perf_evsel *evsel, *leader;
 
 	leader = list_entry(list->next, struct perf_evsel, node);
-	leader->leader = NULL;
 
 	list_for_each_entry(evsel, list, node) {
 		if (evsel != leader)
diff --git a/trunk/tools/perf/util/evsel.c b/trunk/tools/perf/util/evsel.c
index 1b16dd1edc8e..7e93418a45d1 100644
--- a/trunk/tools/perf/util/evsel.c
+++ b/trunk/tools/perf/util/evsel.c
@@ -55,6 +55,7 @@ void perf_evsel__init(struct perf_evsel *evsel,
 {
 	evsel->idx	   = idx;
 	evsel->attr	   = *attr;
+	evsel->leader	   = evsel;
 	INIT_LIST_HEAD(&evsel->node);
 	hists__init(&evsel->hists);
 	evsel->sample_size = __perf_evsel__sample_size(attr->sample_type);
diff --git a/trunk/tools/perf/util/evsel.h b/trunk/tools/perf/util/evsel.h
index 3d2b8017438c..cbf6d97f0646 100644
--- a/trunk/tools/perf/util/evsel.h
+++ b/trunk/tools/perf/util/evsel.h
@@ -228,6 +228,6 @@ static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel)
 
 static inline bool perf_evsel__is_group_member(const struct perf_evsel *evsel)
 {
-	return evsel->leader != NULL;
+	return evsel->leader != evsel;
 }
 #endif /* __PERF_EVSEL_H */