From 3424dabb6508d538e9ec1a2aa889fefbd83df2d0 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Wed, 27 Feb 2013 14:05:53 +0000 Subject: [PATCH] metag: perf: fix core internal / perf channel mux The value written to the PERF_ICOREx or PERF_CHANx register to select the performance events for the core internal and perf channel events was (tmp & 0x0f), but tmp was set to (config & 0xf0) so it would always be 0. Correct it to use config instead of tmp. Signed-off-by: James Hogan Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo --- arch/metag/kernel/perf/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c index a876d5ff3897..f38bf6d4dc55 100644 --- a/arch/metag/kernel/perf/perf_event.c +++ b/arch/metag/kernel/perf/perf_event.c @@ -634,7 +634,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) break; } - metag_out32((tmp & 0x0f), perf_addr); + metag_out32((config & 0x0f), perf_addr); /* * Now we use the high nibble as the performance event to -- 2.34.1