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

Commit 5b0d4b55 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

sparc: perf: Remove redundant perf_pmu_{en|dis}able calls 



perf_pmu_disable is called by core perf code before pmu->del and the
enable function is called by core perf code afterwards. No need to
call again within sparc_pmu_del.

Ditto for pmu->add and sparc_pmu_add.

Signed-off-by: default avatarDavid Ahern <david.ahern@oracle.com>
Acked-by: default avatarBob Picco <bob.picco@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b314acac

arch/sparc/kernel/perf_event.c

+0 −4
Original line number Diff line number Diff line
@@ -1101,7 +1101,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags) 
	int i;



	local_irq_save(flags);

	perf_pmu_disable(event->pmu);



	for (i = 0; i < cpuc->n_events; i++) {

		if (event == cpuc->event[i]) {
@@ -1127,7 +1126,6 @@ static void sparc_pmu_del(struct perf_event *event, int _flags) 
		}

	}



	perf_pmu_enable(event->pmu);

	local_irq_restore(flags);

}
@@ -1361,7 +1359,6 @@ static int sparc_pmu_add(struct perf_event *event, int ef_flags) 
	unsigned long flags;



	local_irq_save(flags);

	perf_pmu_disable(event->pmu);



	n0 = cpuc->n_events;

	if (n0 >= sparc_pmu->max_hw_events)
@@ -1394,7 +1391,6 @@ nocheck: 


	ret = 0;

out:

	perf_pmu_enable(event->pmu);

	local_irq_restore(flags);

	return ret;

}