From a1d1735e98d4968345b99a4fb8b770aeb4632f52 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 11 Feb 2009 13:53:19 +0100 Subject: [PATCH] --- yaml --- r: 147218 b: refs/heads/master c: 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9ca41beea288..2cac44d5712f 100644 --- 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 index e0576c3fdb50..fcefb0a726f3 100644 --- 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); + } } /*