---

yaml --- r: 211938 b: refs/heads/master c: 74c3337 h: refs/heads/master v: v3
git-mirror · Oct 18, 2010 · 7a37b12 · 7a37b12
1 parent 6a25437
commit 7a37b12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e360adbe29241a0194e10e20595360dd7b98a2b3
+refs/heads/master: 74c3337c2fc6389d3a57a622a936036b6db6b2e8
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -315,7 +315,12 @@ static void perf_group_attach(struct perf_event *event)
 {
 	struct perf_event *group_leader = event->group_leader;
 
-	WARN_ON_ONCE(event->attach_state & PERF_ATTACH_GROUP);
+	/*
+	 * We can have double attach due to group movement in perf_event_open.
+	 */
+	if (event->attach_state & PERF_ATTACH_GROUP)
+		return;
+
 	event->attach_state |= PERF_ATTACH_GROUP;
 
 	if (group_leader == event)