From 9df7abddf02dc686640640e76af51883d5d6016d Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Fri, 25 Sep 2009 13:54:01 +0800
Subject: [PATCH] --- yaml --- r: 166898 b: refs/heads/master c:
 27f9994c50e95f3a5a81fe4c7491a9f9cffe6ec0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 96f1347bf756..4bd46d6743f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c9ed8e14c342ec5e7f27e7e498f62409a10eb29
+refs/heads/master: 27f9994c50e95f3a5a81fe4c7491a9f9cffe6ec0
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index e50543db642a..e491fb087939 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -4767,9 +4767,7 @@ int perf_event_init_task(struct task_struct *child)
 	 * We dont have to disable NMIs - we are only looking at
 	 * the list, not manipulating it:
 	 */
-	list_for_each_entry_rcu(event, &parent_ctx->event_list, event_entry) {
-		if (event != event->group_leader)
-			continue;
+	list_for_each_entry(event, &parent_ctx->group_list, group_entry) {
 
 		if (!event->attr.inherit) {
 			inherited_all = 0;