Commit 85a683d0 authored Oct 15, 2019 by Thomas Gleixner Committed by Ingo Molnar Dec 08, 2019

sched/rt, sparc: 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 trap code over to use CONFIG_PREEMPTION.

[bigeasy: +Kconfig]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: sparclinux@vger.kernel.org
Link: https://lore.kernel.org/r/20191015191821.11479-20-bigeasy@linutronix.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 7be60ccb

arch/sparc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,7 @@ config US3_MC
		config GENERIC_LOCKBREAK
		bool
		default y
		depends on SPARC64 && SMP && PREEMPT
		depends on SPARC64 && SMP && PREEMPTION

		config NUMA
		bool "NUMA support"

arch/sparc/kernel/rtrap_64.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -310,7 +310,7 @@ kern_rtt_restore:
		retry

		to_kernel:
		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		ldsw [%g6 + TI_PRE_COUNT], %l5
		brnz %l5, kern_fpucheck
		ldx [%g6 + TI_FLAGS], %l5

Admin message