Skip to content

Commit

Permalink
ARM: 6989/1: perf: do not start the PMU when no events are present
Browse files Browse the repository at this point in the history
armpmu_enable can be called in situations where no events are present
(for example, from the event rotation tick after a profiled task has
exited). In this case, we currently start the PMU anyway which may
leave it active inevitably without any events being monitored.

This patch adds a simple check to the enabling code so that we avoid
starting the PMU when no events are present.

Cc: <stable@kernel.org>
Reported-by: Ashwin Chaugle <ashwinc@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Will Deacon authored and Russell King committed Jul 5, 2011
1 parent 1787836 commit f4f3843
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/arm/kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ static int armpmu_event_init(struct perf_event *event)
static void armpmu_enable(struct pmu *pmu)
{
/* Enable all of the perf events on hardware. */
int idx;
int idx, enabled = 0;
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

if (!armpmu)
Expand All @@ -596,9 +596,11 @@ static void armpmu_enable(struct pmu *pmu)
continue;

armpmu->enable(&event->hw, idx);
enabled = 1;
}

armpmu->start();
if (enabled)
armpmu->start();
}

static void armpmu_disable(struct pmu *pmu)
Expand Down

0 comments on commit f4f3843

Please sign in to comment.