Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e803a27 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: perf: reset perf cycle counter on krait"

parents cb67a437 042417bf

arch/arm/kernel/perf_event_msm_krait.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static void krait_pmu_reset(void *info) 
	u32 idx, nb_cnt = cpu_pmu->num_events;



	/* Stop all counters and their interrupts */

	for (idx = 1; idx < nb_cnt; ++idx) {

	for (idx = ARMV7_IDX_CYCLE_COUNTER; idx < nb_cnt; ++idx) {

		armv7_pmnc_disable_counter(idx);

		armv7_pmnc_disable_intens(idx);

	}

arch/arm/mach-msm/perf_debug.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static char *descriptions = 
	"22 Perf: add perf user-mode permissions\n"

	"23 Perf: Add event type check in hrtimer hotplug fix\n"

	"24 Perf: Add debugfs node to clear PMU\n"

	"25 msm: perf: reset perf cycle counter on krait\n"

;



static ssize_t desc_read(struct file *fp, char __user *buf,