diff options
| author | James Hogan <james.hogan@imgtec.com> | 2013-02-27 14:05:53 +0000 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2013-03-15 13:19:11 +0000 |
| commit | 3424dabb6508d538e9ec1a2aa889fefbd83df2d0 (patch) | |
| tree | 5627fdf3c71884fe2a8d9b6bc2dc901ee02a77d9 /arch/metag | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
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 <james.hogan@imgtec.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'arch/metag')
| -rw-r--r-- | arch/metag/kernel/perf/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |