Commit 1b40cd56 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ingo Molnar
Browse files

sched/rt, locking: Use CONFIG_PREEMPTION 



CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT.
Both PREEMPT and PREEMPT_RT require the same functionality which today
depends on CONFIG_PREEMPT.

Switch the Kconfig dependency to use CONFIG_PREEMPTION.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20191015191821.11479-32-bigeasy@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 923717cb

kernel/Kconfig.locks

+6 −6
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ config UNINLINE_SPIN_UNLOCK 
# unlock and unlock_irq functions are inlined when:

#   - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y

#  or

#   - DEBUG_SPINLOCK=n and PREEMPT=n

#   - DEBUG_SPINLOCK=n and PREEMPTION=n

#

# unlock_bh and unlock_irqrestore functions are inlined when:

#   - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y
@@ -139,7 +139,7 @@ config INLINE_SPIN_UNLOCK_BH 


config INLINE_SPIN_UNLOCK_IRQ

	def_bool y

	depends on !PREEMPT || ARCH_INLINE_SPIN_UNLOCK_IRQ

	depends on !PREEMPTION || ARCH_INLINE_SPIN_UNLOCK_IRQ



config INLINE_SPIN_UNLOCK_IRQRESTORE

	def_bool y
@@ -168,7 +168,7 @@ config INLINE_READ_LOCK_IRQSAVE 


config INLINE_READ_UNLOCK

	def_bool y

	depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK

	depends on !PREEMPTION || ARCH_INLINE_READ_UNLOCK



config INLINE_READ_UNLOCK_BH

	def_bool y
@@ -176,7 +176,7 @@ config INLINE_READ_UNLOCK_BH 


config INLINE_READ_UNLOCK_IRQ

	def_bool y

	depends on !PREEMPT || ARCH_INLINE_READ_UNLOCK_IRQ

	depends on !PREEMPTION || ARCH_INLINE_READ_UNLOCK_IRQ



config INLINE_READ_UNLOCK_IRQRESTORE

	def_bool y
@@ -205,7 +205,7 @@ config INLINE_WRITE_LOCK_IRQSAVE 


config INLINE_WRITE_UNLOCK

	def_bool y

	depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK

	depends on !PREEMPTION || ARCH_INLINE_WRITE_UNLOCK



config INLINE_WRITE_UNLOCK_BH

	def_bool y
@@ -213,7 +213,7 @@ config INLINE_WRITE_UNLOCK_BH 


config INLINE_WRITE_UNLOCK_IRQ

	def_bool y

	depends on !PREEMPT || ARCH_INLINE_WRITE_UNLOCK_IRQ

	depends on !PREEMPTION || ARCH_INLINE_WRITE_UNLOCK_IRQ



config INLINE_WRITE_UNLOCK_IRQRESTORE

	def_bool y

CRA Git | Maintained and supported by SUSTech CRA and CCSE