| Date | Sun, 08 Dec 2019 14:58:31 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: sched/urgent] sched/rt, sh: Use CONFIG_PREEMPTION |
| |
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 7be60ccbc59098f5251edae51bbf08e2d2226da0 Gitweb: https://git.kernel.org/tip/7be60ccbc59098f5251edae51bbf08e2d2226da0 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 15 Oct 2019 21:18:05 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Sun, 08 Dec 2019 14:37:35 +01:00
sched/rt, sh: 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 entry 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> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rich Felker <dalias@libc.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: linux-sh@vger.kernel.org Link: https://lore.kernel.org/r/20191015191821.11479-19-bigeasy@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/sh/Kconfig | 2 +- arch/sh/kernel/cpu/sh5/entry.S | 4 ++-- arch/sh/kernel/entry-common.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index f356ee6..9ece111 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -108,7 +108,7 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_LOCKBREAK def_bool y - depends on SMP && PREEMPT + depends on SMP && PREEMPTION config ARCH_SUSPEND_POSSIBLE def_bool n diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index de68ffd..81c8b64 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S @@ -86,7 +86,7 @@ andi r6, ~0xf0, r6; \ putcon r6, SR; -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION # define preempt_stop() CLI() #else # define preempt_stop() @@ -884,7 +884,7 @@ ret_from_exception: /* Check softirqs */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION pta ret_from_syscall, tr0 blink tr0, ZERO diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index d31f66e..956a7a0 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -41,7 +41,7 @@ */ #include <asm/dwarf.h> -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) # define preempt_stop() cli ; TRACE_IRQS_OFF #else # define preempt_stop() @@ -84,7 +84,7 @@ ENTRY(ret_from_irq) get_current_thread_info r8, r0 bt resume_kernel ! Yes, it's from kernel, go back soon -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION bra resume_userspace nop ENTRY(resume_kernel)
|