---

yaml --- r: 147218 b: refs/heads/master c: 4bcf349 h: refs/heads/master v: v3
git-mirror · Feb 11, 2009 · a1d1735 · a1d1735
1 parent fe093fb
commit a1d1735
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5af759176cc767e7426f89764bde4996ebaaf419
+refs/heads/master: 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -1958,14 +1958,13 @@ __perf_counter_exit_task(struct task_struct *child,
 		sync_child_counter(child_counter, parent_counter);
 		list_for_each_entry_safe(sub, tmp, &child_counter->sibling_list,
 					 list_entry) {
-			if (sub->parent)
+			if (sub->parent) {
 				sync_child_counter(sub, sub->parent);
-			kfree(sub);
+				kfree(sub);
+			}
 		}
-	}
-
-	if (!child_counter->filp || !atomic_long_read(&child_counter->filp->f_count))
 		kfree(child_counter);
+	}
 }
 
 /*