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 branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
perf_event.c
diff --git
a/kernel/perf_event.c
b/kernel/perf_event.c
index c772a3d4000d85a1fc0691626d3ff26c90bb1c12..403d1804b198140e4f1355c70c0b25e6efa9e5d8 100644
(file)
--- a/
kernel/perf_event.c
+++ b/
kernel/perf_event.c
@@
-214,7
+214,7
@@
static void perf_unpin_context(struct perf_event_context *ctx)
static inline u64 perf_clock(void)
{
- return
cpu_clock(raw_smp_processor_id()
);
+ return
local_clock(
);
}
/*