Merge "perf: Allow multiple cycle count requests" into msm-4.9 (4295a5d6) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/kernel/perf_event.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -840,11 +840,9 @@ static int armv8pmu_get_event_idx(struct pmu_hw_events *cpuc,
		struct hw_perf_event *hwc = &event->hw;
		unsigned long evtype = hwc->config_base & ARMV8_PMU_EVTYPE_EVENT;

		/* Always place a cycle counter into the cycle counter. */
		/* Place the first cycle counter request into the cycle counter. */
		if (evtype == ARMV8_PMUV3_PERFCTR_CPU_CYCLES) {
		if (test_and_set_bit(ARMV8_IDX_CYCLE_COUNTER, cpuc->used_mask))
		return -EAGAIN;

		if (!test_and_set_bit(ARMV8_IDX_CYCLE_COUNTER, cpuc->used_mask))
		return ARMV8_IDX_CYCLE_COUNTER;
		}