path: root/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-21 10:51:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-21 10:51:00 -0800
commitc4ff10efe8e487cd35f4475ed2dd1e5e0c6f784a (patch)
tree0fff372310e9d54d5e82fc2aaca2698371410944 /kernel
parent6c1c79a5f4eead27465d4d1d97ce230163772a78 (diff)
parent9f0bff1180efc9ea988fed3fd93da7647151ac8b (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "Misc fixes: a BTS fix, a PT NMI handling fix, a PMU sysfs fix and an SRCU annotation" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/core: Add SRCU annotation for pmus list walk perf/x86/intel: Fix PT PMI handling perf/x86/intel/bts: Fix the use of page_private() perf/x86: Fix potential out-of-bounds access
Diffstat (limited to 'kernel')
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 4ff86d57f9e5..a1f8bde19b56 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10523,7 +10523,7 @@ again:
goto unlock;
- list_for_each_entry_rcu(pmu, &pmus, entry) {
+ list_for_each_entry_rcu(pmu, &pmus, entry, lockdep_is_held(&pmus_srcu)) {
ret = perf_try_init_event(pmu, event);
if (!ret)
goto unlock;

Privacy Policy