From: Thomas Gleixner Date: Tue, 15 Oct 2019 19:18:06 +0000 (+0200) Subject: sched/rt, sparc: Use CONFIG_PREEMPTION X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=85a683d0a6895026b535bf40643687c626e376f3;p=linux.git 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 Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Acked-by: David S. Miller Cc: Linus Torvalds Cc: Peter Zijlstra Cc: sparclinux@vger.kernel.org Link: https://lore.kernel.org/r/20191015191821.11479-20-bigeasy@linutronix.de Signed-off-by: Ingo Molnar --- diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index eb24cb1afc11f..e8c3ea01c12f6 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -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" diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S index 29aa34f11720c..c5fd4b450d9b6 100644 --- a/arch/sparc/kernel/rtrap_64.S +++ b/arch/sparc/kernel/rtrap_64.S @@ -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