Commit d56d4a11 authored Mar 22, 2026 by Linus Torvalds

Merge tag 'locking-urgent-2026-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fix from Ingo Molnar:
 "Fix a sparse build error regression in <linux/local_lock_internal.h>
  caused by the locking context-analysis changes"

* tag 'locking-urgent-2026-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  include/linux/local_lock_internal.h: Make this header file again compatible with sparse

parents b5fddfad 14de1552

include/linux/local_lock_internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ do { \

		#endif /* CONFIG_PREEMPT_RT */

		#if defined(WARN_CONTEXT_ANALYSIS)
		#if defined(WARN_CONTEXT_ANALYSIS) && !defined(__CHECKER__)
		/*
		* Because the compiler only knows about the base per-CPU variable, use this
		* helper function to make the compiler think we lock/unlock the @base variable,