浏览代码

sparc64: Fix maybe_change_configuration() PCR setting.

Need to mask out the existing event bits before OR'ing in
the new ones.

Noticed by Peter Zijlstra.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 15 年之前
父节点
当前提交
b7d45c3f74
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      arch/sparc/kernel/perf_event.c

+ 1 - 0
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: