Skip to content

Commit

Permalink
sparc64: Rework sparc_pmu_enable() so that the side effects are clearer.
Browse files Browse the repository at this point in the history
When cpuc->n_events is zero, we actually don't do anything and we just
write the cpuc->pcr[0] value as-is without any modifications.

The "pcr = 0;" assignment there was just useless and confusing.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Aug 19, 2012
1 parent 3f1a209 commit 5ab9684
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions arch/sparc/kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,19 +752,15 @@ static u64 maybe_change_configuration(struct cpu_hw_events *cpuc, u64 pcr)
static void sparc_pmu_enable(struct pmu *pmu)
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
u64 pcr;

if (cpuc->enabled)
return;

cpuc->enabled = 1;
barrier();

pcr = cpuc->pcr[0];
if (!cpuc->n_events) {
pcr = 0;
} else {
pcr = maybe_change_configuration(cpuc, pcr);
if (cpuc->n_events) {
u64 pcr = maybe_change_configuration(cpuc, cpuc->pcr[0]);

/* We require that all of the events have the same
* configuration, so just fetch the settings from the
Expand Down

0 comments on commit 5ab9684

Please sign in to comment.