diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-08-23 15:19:28 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-08-23 15:19:28 -0700 |
| commit | 96bf667ad140cf86071c5a3eaaaab20a2ece47eb (patch) | |
| tree | 23f9fa00b3a8baefed3ee09c7f7480c9863debf3 /arch/arm/kernel | |
| parent | aac14278d936b1287ca0f258367a1f5b1cfc453d (diff) | |
| parent | c645ffa8ed7fda502d8a763cf5df3e872a43fbba (diff) | |
Merge branch 'linux-tegra-2.6.39' into linux-tegra-nv-2.6.39
Conflicts:
drivers/usb/class/cdc-acm.c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
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) |