diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-09-29 16:52:25 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-11 19:27:10 +0200 |
| commit | 81771974ae49bf79aab60c42eac7a6d730a9ef2b (patch) | |
| tree | 82f6448db358d7850f52516ebab38f90a6f06190 /drivers/oprofile | |
| parent | Merge branch 'oprofile/urgent' (early part) into oprofile/perf (diff) | |
| download | linux-81771974ae49bf79aab60c42eac7a6d730a9ef2b.tar.xz linux-81771974ae49bf79aab60c42eac7a6d730a9ef2b.zip | |
oprofile, ARM: Release resources on failure
This patch fixes a resource leak on failure, where the
oprofilefs and some counters may not released properly.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: <stable@kernel.org> # .35.x
LKML-Reference: <20100929145225.GJ13563@erda.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/oprofile')
| -rw-r--r-- | drivers/oprofile/oprofile_perf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index ebb40cb87474..f3d3df229a43 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c @@ -84,6 +84,7 @@ static int op_create_counter(int cpu, int event) if (IS_ERR(pevent)) { ret = PTR_ERR(pevent); } else if (pevent->state != PERF_EVENT_STATE_ACTIVE) { + perf_event_release_kernel(pevent); pr_warning("oprofile: failed to enable event %d " "on CPU %d\n", event, cpu); ret = -EBUSY; |