lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc64: Rework sparc_pmu_enable() so that the side effects are clearer.

Browse Source 
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>
This commit is contained in:
David S. Miller
2012-08-17 03:09:39 -07:00
parent 3f1a209722
commit 5ab9684135
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sparc/kernel/perf_event.c
View File

@@ -752,7 +752,6 @@ out:
static void sparc_pmu_enable(struct pmu *pmu) static void sparc_pmu_enable(struct pmu *pmu)
{ {
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
u64 pcr;
if (cpuc->enabled) if (cpuc->enabled)
return; return;
@@ -760,11 +759,8 @@ static void sparc_pmu_enable(struct pmu *pmu)
cpuc->enabled = 1; cpuc->enabled = 1;
barrier(); barrier();
pcr = cpuc->pcr[0]; if (cpuc->n_events) {
if (!cpuc->n_events) { u64 pcr = maybe_change_configuration(cpuc, cpuc->pcr[0]);
pcr = 0;
} else {
pcr = maybe_change_configuration(cpuc, pcr);
/* We require that all of the events have the same /* We require that all of the events have the same
* configuration, so just fetch the settings from the * configuration, so just fetch the settings from the