projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tags/ib-asoc-1' into for-mfd-next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
kernel
/
perf_event_cpu.c
diff --git
a/arch/arm/kernel/perf_event_cpu.c
b/arch/arm/kernel/perf_event_cpu.c
index 8d6147b2001f82eca02c738265f9477dc2dbaefa..d85055cd24bacc55cde9e99f1547afbfe33317ae 100644
(file)
--- 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)