X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fperf_event_cpu.c;h=d85055cd24bacc55cde9e99f1547afbfe33317ae;hb=6eb37eb276f0b91adb43b853ce6fb0812fbf0883;hp=8d6147b2001f82eca02c738265f9477dc2dbaefa;hpb=dd0a11815a339d6deeea8357574f8126a8404c92;p=firefly-linux-kernel-4.4.55.git

diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index 8d6147b2001f..d85055cd24ba 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(perf_num_counters);
 
 static struct pmu_hw_events *cpu_pmu_get_cpu_events(void)
 {
-	return &__get_cpu_var(cpu_hw_events);
+	return this_cpu_ptr(&cpu_hw_events);
 }
 
 static void cpu_pmu_free_irq(struct arm_pmu *cpu_pmu)