|
@@ -235,20 +235,15 @@ armpmu_add(struct perf_event *event, int flags)
|
|
|
struct pmu_hw_events *hw_events = this_cpu_ptr(armpmu->hw_events);
|
|
|
struct hw_perf_event *hwc = &event->hw;
|
|
|
int idx;
|
|
|
- int err = 0;
|
|
|
|
|
|
/* An event following a process won't be stopped earlier */
|
|
|
if (!cpumask_test_cpu(smp_processor_id(), &armpmu->supported_cpus))
|
|
|
return -ENOENT;
|
|
|
|
|
|
- perf_pmu_disable(event->pmu);
|
|
|
-
|
|
|
/* If we don't have a space for the counter then finish early. */
|
|
|
idx = armpmu->get_event_idx(hw_events, event);
|
|
|
- if (idx < 0) {
|
|
|
- err = idx;
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ if (idx < 0)
|
|
|
+ return idx;
|
|
|
|
|
|
/*
|
|
|
* If there is an event in the counter we are going to use then make
|
|
@@ -265,9 +260,7 @@ armpmu_add(struct perf_event *event, int flags)
|
|
|
/* Propagate our changes to the userspace mapping. */
|
|
|
perf_event_update_userpage(event);
|
|
|
|
|
|
-out:
|
|
|
- perf_pmu_enable(event->pmu);
|
|
|
- return err;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static int
|