Skip to content

Commit 0ce3804

Browse files
author
Peter Zijlstra
committed
perf: Fix lockdep_assert_event_ctx()
I'm a flamin' moron; because even after Mark told me it should be '&&' I still got it wrong in the final commit. Fixes: f3c0eba ("perf: Add a few assertions") Reported-by: Borislav Petkov <bp@alien8.de> Reported-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Borislav Petkov <bp@alien8.de> Link: https://lkml.kernel.org/r/YvvIWmDBWdIUCMZj@FVFF77S0Q05N
1 parent 3f9a1b3 commit 0ce3804

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/perf_event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ struct pmu_event_list {
644644
#ifdef CONFIG_PROVE_LOCKING
645645
#define lockdep_assert_event_ctx(event) \
646646
WARN_ON_ONCE(__lockdep_enabled && \
647-
(this_cpu_read(hardirqs_enabled) || \
647+
(this_cpu_read(hardirqs_enabled) && \
648648
lockdep_is_held(&(event)->ctx->mutex) != LOCK_STATE_HELD))
649649
#else
650650
#define lockdep_assert_event_ctx(event)

0 commit comments

Comments
 (0)