diff options
| author | Christoph Lameter | 2013-10-21 14:17:08 +0200 |
|---|---|---|
| committer | Russell King | 2013-10-29 12:06:27 +0100 |
| commit | 1436c1aa626d0bc0e35c5c5231127086e80ab24a (patch) | |
| tree | df8d5d0f892a502f3a5654745f539f3c6db4fe09 /arch/arm64/kernel/perf_event.c | |
| parent | ARM: 7861/1: cacheflush: consolidate single-CPU ARMv7 cache disabling code (diff) | |
| download | kernel-qcow2-linux-1436c1aa626d0bc0e35c5c5231127086e80ab24a.tar.gz kernel-qcow2-linux-1436c1aa626d0bc0e35c5c5231127086e80ab24a.tar.xz kernel-qcow2-linux-1436c1aa626d0bc0e35c5c5231127086e80ab24a.zip | |
ARM: 7862/1: pcpu: replace __get_cpu_var_uses
This is the ARM part of Christoph's patchset cleaning up the various
uses of __get_cpu_var across the tree.
The idea is to convert __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations
that use the offset. Thereby address calculations are avoided and fewer
registers are used when code is generated.
[will: fixed debug ref counting checks and pcpu array accesses]
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm64/kernel/perf_event.c')
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index cea1594ff933..6983ed5a351a 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1044,7 +1044,7 @@ static irqreturn_t armv8pmu_handle_irq(int irq_num, void *dev) */ regs = get_irq_regs(); - cpuc = &__get_cpu_var(cpu_hw_events); + cpuc = this_cpu_ptr(&cpu_hw_events); for (idx = 0; idx < cpu_pmu->num_events; ++idx) { struct perf_event *event = cpuc->events[idx]; struct hw_perf_event *hwc; @@ -1257,7 +1257,7 @@ device_initcall(register_pmu_driver); static struct pmu_hw_events *armpmu_get_cpu_events(void) { - return &__get_cpu_var(cpu_hw_events); + return this_cpu_ptr(&cpu_hw_events); } static void __init cpu_pmu_init(struct arm_pmu *armpmu) |