Commit 7b5cf701 authored Jul 22, 2019 by Linus Torvalds

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull preemption Kconfig fix from Thomas Gleixner:
 "The PREEMPT_RT stub config renamed PREEMPT to PREEMPT_LL and defined
  PREEMPT outside of the menu and made it selectable by both PREEMPT_LL
  and PREEMPT_RT.

  Stupid me missed that 114 defconfigs select CONFIG_PREEMPT which
  obviously can't work anymore. oldconfig builds are affected as well,
  but it's more obvious as the user gets asked. [old]defconfig silently
  fixes it up and selects PREEMPT_NONE.

  Unbreak it by undoing the rename and adding a intermediate config
  symbol which is selected by both PREEMPT and PREEMPT_RT. That requires
  to chase down a few #ifdefs, but it's better than tweaking 114
  defconfigs and annoying users"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/rt, Kconfig: Unbreak def/oldconfig with CONFIG_PREEMPT=y

parents 44b912cd b8d33498

kernel/Kconfig.preempt

+4 −4

Original line number	Diff line number	Diff line
		@@ -35,10 +35,10 @@ config PREEMPT_VOLUNTARY

		Select this if you are building a kernel for a desktop system.

		config PREEMPT_LL
		config PREEMPT
		bool "Preemptible Kernel (Low-Latency Desktop)"
		depends on !ARCH_NO_PREEMPT
		select PREEMPT
		select PREEMPTION
		select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
		help
		This option reduces the latency of the kernel by making
		@@ -58,7 +58,7 @@ config PREEMPT_LL
		config PREEMPT_RT
		bool "Fully Preemptible Kernel (Real-Time)"
		depends on EXPERT && ARCH_SUPPORTS_RT
		select PREEMPT
		select PREEMPTION
		help
		This option turns the kernel into a real-time kernel by replacing
		various locking primitives (spinlocks, rwlocks, etc.) with
		@@ -77,6 +77,6 @@ endchoice
		config PREEMPT_COUNT
		bool

		config PREEMPT
		config PREEMPTION
		bool
		select PREEMPT_COUNT

Admin message