---

yaml --- r: 201132 b: refs/heads/master c: b7d45c3 h: refs/heads/master v: v3
git-mirror · Jun 23, 2010 · 36f25c8 · 36f25c8
1 parent d5f40b8
commit 36f25c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2
+refs/heads/master: b7d45c3f741b114cdda9ee0cd727afaf60a1bf37
diff --git a/trunk/arch/sparc/kernel/perf_event.c b/trunk/arch/sparc/kernel/perf_event.c
@@ -655,6 +655,7 @@ static u64 maybe_change_configuration(struct cpu_hw_events *cpuc, u64 pcr)
 		cpuc->current_idx[i] = idx;
 
 		enc = perf_event_get_enc(cpuc->events[i]);
+		pcr &= ~mask_for_index(idx);
 		pcr |= event_encoding(enc, idx);
 	}
 out: