Skip to content

Commit b8d3349

Browse files
committed
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: Mark Rutland <[email protected]> Fixes: a50a3f4 ("sched/rt, Kconfig: Introduce CONFIG_PREEMPT_RT") Signed-off-by: Thomas Gleixner <[email protected]>
1 parent 5f9e832 commit b8d3349

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

kernel/Kconfig.preempt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ config PREEMPT_VOLUNTARY
3535

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

38-
config PREEMPT_LL
38+
config PREEMPT
3939
bool "Preemptible Kernel (Low-Latency Desktop)"
4040
depends on !ARCH_NO_PREEMPT
41-
select PREEMPT
41+
select PREEMPTION
4242
select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
4343
help
4444
This option reduces the latency of the kernel by making
@@ -58,7 +58,7 @@ config PREEMPT_LL
5858
config PREEMPT_RT
5959
bool "Fully Preemptible Kernel (Real-Time)"
6060
depends on EXPERT && ARCH_SUPPORTS_RT
61-
select PREEMPT
61+
select PREEMPTION
6262
help
6363
This option turns the kernel into a real-time kernel by replacing
6464
various locking primitives (spinlocks, rwlocks, etc.) with
@@ -77,6 +77,6 @@ endchoice
7777
config PREEMPT_COUNT
7878
bool
7979

80-
config PREEMPT
80+
config PREEMPTION
8181
bool
8282
select PREEMPT_COUNT

0 commit comments

Comments
 (0)