diff options
| author | Colin Cross <ccross@android.com> | 2011-08-08 17:16:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-08 17:16:17 -0700 |
| commit | 468c64fd402ad29dcc8ffbe5b9efb8acf36c7e55 (patch) | |
| tree | 03a80f7a55d53243c3a4e125e51290e76bb9e48a /arch/arm/kernel | |
| parent | 9c0f85dc32867c3d0615bcf626321584db801b2f (diff) | |
| parent | ea0dc0dc1c1dca25e50384e300a528db57ee7de5 (diff) | |
Merge commit 'v2.6.39.4' into linux-tegra-2.6.39
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 139e3c827369..d284a30b98ea 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -588,7 +588,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) @@ -601,9 +601,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) |