aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/perf_counter.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index e0576c3fdb50..fcefb0a726f3 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1958,14 +1958,13 @@ __perf_counter_exit_task(struct task_struct *child,
1958 sync_child_counter(child_counter, parent_counter); 1958 sync_child_counter(child_counter, parent_counter);
1959 list_for_each_entry_safe(sub, tmp, &child_counter->sibling_list, 1959 list_for_each_entry_safe(sub, tmp, &child_counter->sibling_list,
1960 list_entry) { 1960 list_entry) {
1961 if (sub->parent) 1961 if (sub->parent) {
1962 sync_child_counter(sub, sub->parent); 1962 sync_child_counter(sub, sub->parent);
1963 kfree(sub); 1963 kfree(sub);
1964 }
1964 } 1965 }
1965 }
1966
1967 if (!child_counter->filp || !atomic_long_read(&child_counter->filp->f_count))
1968 kfree(child_counter); 1966 kfree(child_counter);
1967 }
1969} 1968}
1970 1969
1971/* 1970/*