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 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
cpu
/
perf_event_p4.c
diff --git
a/arch/x86/kernel/cpu/perf_event_p4.c
b/arch/x86/kernel/cpu/perf_event_p4.c
index 0811f5ebfba6643083b50d81c5710292db12b4b6..c2520e178d32147fd9e2acd954d59e4217115add 100644
(file)
--- a/
arch/x86/kernel/cpu/perf_event_p4.c
+++ b/
arch/x86/kernel/cpu/perf_event_p4.c
@@
-777,6
+777,7
@@
static inline int p4_pmu_clear_cccr_ovf(struct hw_perf_event *hwc)
* the counter has reached zero value and continued counting before
* real NMI signal was received:
*/
+ rdmsrl(hwc->event_base, v);
if (!(v & ARCH_P4_UNFLAGGED_BIT))
return 1;