Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d33498 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

sched/rt, Kconfig: Unbreak def/oldconfig with CONFIG_PREEMPT=y 



The merge of the CONFIG_PREEMPT_RT stub renamed CONFIG_PREEMPT to
CONFIG_PREEMPT_LL which causes all defconfigs which have CONFIG_PREEMPT=y
set to fall back to CONFIG_PREEMPT_NONE because CONFIG_PREEMPT depends on
the preemption mode choice wich defaults to NONE. This also affects
oldconfig builds.

So rather than changing 114 defconfig files and being an annoyance to
users, revert the rename and select a new config symbol PREEMPTION. That
keeps everything working smoothly and the revelant ifdef's are going to be
fixed up step by step.

Reported-by: default avatarMark Rutland <mark.rutland@arm.com>
Fixes: a50a3f4b ("sched/rt, Kconfig: Introduce CONFIG_PREEMPT_RT")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5f9e832c

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