| From | Sebastian Andrzej Siewior <> | Subject | [PATCH 13/34] nds32: Use CONFIG_PREEMPTION | Date | Tue, 15 Oct 2019 21:18:00 +0200 |
| |
From: Thomas Gleixner <tglx@linutronix.de>
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 ex-exit code over to use CONFIG_PREEMPTION.
Cc: Greentime Hu <green.hu@gmail.com> Cc: Vincent Chen <deanbo422@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> [bigeasy: +Kconfig] Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- arch/nds32/Kconfig | 2 +- arch/nds32/kernel/ex-exit.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig index fbd68329737f4..abbb74e46f054 100644 --- a/arch/nds32/Kconfig +++ b/arch/nds32/Kconfig @@ -61,7 +61,7 @@ config GENERIC_HWEIGHT config GENERIC_LOCKBREAK def_bool y - depends on PREEMPT + depends on PREEMPTION config TRACE_IRQFLAGS_SUPPORT def_bool y diff --git a/arch/nds32/kernel/ex-exit.S b/arch/nds32/kernel/ex-exit.S index 1df02a7933641..6a2966c2d8c8f 100644 --- a/arch/nds32/kernel/ex-exit.S +++ b/arch/nds32/kernel/ex-exit.S @@ -72,7 +72,7 @@ restore_user_regs_last .endm -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION .macro preempt_stop .endm #else @@ -158,7 +158,7 @@ ENTRY(ret_slow_syscall) /* * preemptive kernel */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION resume_kernel: gie_disable lwi $t0, [tsk+#TSK_TI_PREEMPT] -- 2.23.0
|