From 36f25c8b0d5c26490eaa0675857eab2bd27dbefd Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 23 Jun 2010 11:39:02 -0700 Subject: [PATCH] --- yaml --- r: 201132 b: refs/heads/master c: b7d45c3f741b114cdda9ee0cd727afaf60a1bf37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/perf_event.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index af6d0f83def5..66c65d36364c 100644 --- 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 index 34ce49f80eac..2e1698332b6d 100644 --- 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: