Commit 0ce38047 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

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: f3c0eba2 ("perf: Add a few assertions")
Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Reported-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarBorislav Petkov <bp@alien8.de>
Link: https://lkml.kernel.org/r/YvvIWmDBWdIUCMZj@FVFF77S0Q05N
parent 3f9a1b35

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ struct pmu_event_list { 
#ifdef CONFIG_PROVE_LOCKING

#define lockdep_assert_event_ctx(event)				\

	WARN_ON_ONCE(__lockdep_enabled &&			\

		     (this_cpu_read(hardirqs_enabled) ||	\

		     (this_cpu_read(hardirqs_enabled) &&	\

		      lockdep_is_held(&(event)->ctx->mutex) != LOCK_STATE_HELD))

#else

#define lockdep_assert_event_ctx(event)