---

yaml --- r: 327337 b: refs/heads/master c: 5ab9684 h: refs/heads/master i: 327335: 40e5f73 v: v3
git-mirror · Aug 19, 2012 · 6c0ac07 · 6c0ac07
1 parent d5140e5
commit 6c0ac07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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