From 6c0ac073222f94d18272d514fdc439d0a9051ff1 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 17 Aug 2012 03:09:39 -0700 Subject: [PATCH] --- yaml --- r: 327337 b: refs/heads/master c: 5ab968413515e17788003c522f7ca40a07fae900 h: refs/heads/master i: 327335: 40e5f730070ca69e92b9efb70999f9759d3da80a v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/perf_event.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ac78fe4614cc..8a6b1dbc4cc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f1a20972239e3f66720c34d9009ae9cc9ddffba +refs/heads/master: 5ab968413515e17788003c522f7ca40a07fae900 diff --git a/trunk/arch/sparc/kernel/perf_event.c b/trunk/arch/sparc/kernel/perf_event.c index 9be089abb5d1..197c79e9206a 100644 --- a/trunk/arch/sparc/kernel/perf_event.c +++ b/trunk/arch/sparc/kernel/perf_event.c @@ -752,7 +752,6 @@ 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; @@ -760,11 +759,8 @@ static void sparc_pmu_enable(struct pmu *pmu) 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