aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/Kconfig.preempt
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-22 11:59:19 -0400
committerThomas Gleixner <tglx@linutronix.de>2019-07-22 12:05:11 -0400
commitb8d3349803ba34afda429e87a837fd95a99b2349 (patch)
treeb9e24b4a82f95d204106d19c6d9f5e17bc2c677d /kernel/Kconfig.preempt
parent5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff)
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 <mark.rutland@arm.com> Fixes: a50a3f4b6a31 ("sched/rt, Kconfig: Introduce CONFIG_PREEMPT_RT") Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/Kconfig.preempt')
-rw-r--r--kernel/Kconfig.preempt8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index fc020c09b7e8..deff97217496 100644
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -35,10 +35,10 @@ config PREEMPT_VOLUNTARY
35 35
36 Select this if you are building a kernel for a desktop system. 36 Select this if you are building a kernel for a desktop system.
37 37
38config PREEMPT_LL 38config PREEMPT
39 bool "Preemptible Kernel (Low-Latency Desktop)" 39 bool "Preemptible Kernel (Low-Latency Desktop)"
40 depends on !ARCH_NO_PREEMPT 40 depends on !ARCH_NO_PREEMPT
41 select PREEMPT 41 select PREEMPTION
42 select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK 42 select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
43 help 43 help
44 This option reduces the latency of the kernel by making 44 This option reduces the latency of the kernel by making
@@ -58,7 +58,7 @@ config PREEMPT_LL
58config PREEMPT_RT 58config PREEMPT_RT
59 bool "Fully Preemptible Kernel (Real-Time)" 59 bool "Fully Preemptible Kernel (Real-Time)"
60 depends on EXPERT && ARCH_SUPPORTS_RT 60 depends on EXPERT && ARCH_SUPPORTS_RT
61 select PREEMPT 61 select PREEMPTION
62 help 62 help
63 This option turns the kernel into a real-time kernel by replacing 63 This option turns the kernel into a real-time kernel by replacing
64 various locking primitives (spinlocks, rwlocks, etc.) with 64 various locking primitives (spinlocks, rwlocks, etc.) with
@@ -77,6 +77,6 @@ endchoice
77config PREEMPT_COUNT 77config PREEMPT_COUNT
78 bool 78 bool
79 79
80config PREEMPT 80config PREEMPTION
81 bool 81 bool
82 select PREEMPT_COUNT 82 select PREEMPT_COUNT