Commit b4102208 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull locking fix from Ingo Molnar:
 "Now that LLVM 22 has been released officially, require a release
  version to use the new CONFIG_WARN_CONTEXT_ANALYSIS feature.

  In particular this avoids the widely used Android clang 22.0.1
  pre-release build which is known to be broken for this usecase"

* tag 'locking-urgent-2026-03-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lib/Kconfig.debug: Require a release version of LLVM 22 for context analysis
parents afa84436 ab6088e7

lib/Kconfig.debug

+2 −2
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ config DEBUG_FORCE_WEAK_PER_CPU 


config WARN_CONTEXT_ANALYSIS

	bool "Compiler context-analysis warnings"

	depends on CC_IS_CLANG && CLANG_VERSION >= 220000

	depends on CC_IS_CLANG && CLANG_VERSION >= 220100

	# Branch profiling re-defines "if", which messes with the compiler's

	# ability to analyze __cond_acquires(..), resulting in false positives.

	depends on !TRACE_BRANCH_PROFILING
@@ -641,7 +641,7 @@ config WARN_CONTEXT_ANALYSIS 
	  and releasing user-definable "context locks".



	  Clang's name of the feature is "Thread Safety Analysis". Requires

	  Clang 22 or later.

	  Clang 22.1.0 or later.



	  Produces warnings by default. Select CONFIG_WERROR if you wish to

	  turn these warnings into errors.