Merge tag 's390-7.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2b414a95 · Linus Torvalds <[email protected]> · 2026-06-11 10:30:37 -07:00

Pull s390 fix from Alexander Gordeev:

 - s390 selects GENERIC_LOCKBREAK when PREEMPT is enabled to tackle an
   old compile error that no longer exists. Since recently PREEMPT is
   always enabled, this LOCKBREAK config causes massive performance
   regressions.

   Remove GENERIC_LOCKBREAK from s390 Kconfig to fix the degradation.

* tag 's390-7.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: Remove GENERIC_LOCKBREAK Kconfig option

Commit: 2b414a95b8f7307d42173ba9e580d6d3e2bcbfce
Parents: 22e20364 · 1f57f68c

Merge commit. Changes below are compared with the first parent: 22e20364.

Changes

1 files changed · +0 −3

File	Status	Add	Del	Content
arch/s390/Kconfig	modified	+0	−3	View file

arch/s390/Kconfig

View file

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ecbcbb7..9921a37 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -29,9 +29,6 @@ config GENERIC_BUG
 config GENERIC_BUG_RELATIVE_POINTERS
 	def_bool y
 
-config GENERIC_LOCKBREAK
-	def_bool y if PREEMPTION
-
 config AUDIT_ARCH
 	def_bool y
 