diff options
| author | James Hogan <james.hogan@imgtec.com> | 2013-02-27 16:48:42 +0000 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2013-03-15 13:20:10 +0000 |
| commit | 9344de1b1c64b2217f3b15508266deff2a8d6c84 (patch) | |
| tree | 7502e44ac7976606a681e049332e7a98343027f3 /arch/metag | |
| parent | 2033dc54e6fffac01f6129c0038c2e78102cf59a (diff) | |
| download | talos-op-linux-9344de1b1c64b2217f3b15508266deff2a8d6c84.tar.gz talos-op-linux-9344de1b1c64b2217f3b15508266deff2a8d6c84.zip | |
metag: perf: use hard_processor_id() to get thread
Use hard_processor_id() to get the current thread number rather than
get_cpu() and the hardware thread mapping. There was no matching
put_cpu(), and in any case this should be slightly more efficient.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c index 6210126de78a..54fde35b4b9c 100644 --- a/arch/metag/kernel/perf/perf_event.c +++ b/arch/metag/kernel/perf/perf_event.c @@ -22,9 +22,9 @@ #include <linux/slab.h> #include <asm/core_reg.h> -#include <asm/hwthread.h> #include <asm/io.h> #include <asm/irq.h> +#include <asm/processor.h> #include "perf_event.h" @@ -651,7 +651,7 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx) } tmp = ((config & 0xf) << 28) | - ((1 << 24) << cpu_2_hwthread_id[get_cpu()]); + ((1 << 24) << hard_processor_id()); if (metag_pmu->max_period) /* * Cores supporting overflow interrupts may have had the counter |
