iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sched/rt, sh: Use CONFIG_PREEMPTION

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2019-10-15 21:18:05 +02:00 committed by Ingo Molnar
parent fa68645305
commit 7be60ccbc5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/Kconfig
View File

@ -108,7 +108,7 @@ config GENERIC_CALIBRATE_DELAY
config GENERIC_LOCKBREAK config GENERIC_LOCKBREAK
def_bool y def_bool y
depends on SMP && PREEMPT depends on SMP && PREEMPTION
config ARCH_SUSPEND_POSSIBLE config ARCH_SUSPEND_POSSIBLE
def_bool n def_bool n

4
arch/sh/kernel/cpu/sh5/entry.S
View File

@ -86,7 +86,7 @@
andi r6, ~0xf0, r6; \ andi r6, ~0xf0, r6; \
putcon r6, SR; putcon r6, SR;
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPTION
# define preempt_stop() CLI() # define preempt_stop() CLI()
#else #else
# define preempt_stop() # define preempt_stop()
@ -884,7 +884,7 @@ ret_from_exception:
/* Check softirqs */ /* Check softirqs */
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPTION
pta ret_from_syscall, tr0 pta ret_from_syscall, tr0
blink tr0, ZERO blink tr0, ZERO

4
arch/sh/kernel/entry-common.S
View File

@ -41,7 +41,7 @@
*/ */
#include <asm/dwarf.h> #include <asm/dwarf.h>
#if defined(CONFIG_PREEMPT) #if defined(CONFIG_PREEMPTION)
# define preempt_stop() cli ; TRACE_IRQS_OFF # define preempt_stop() cli ; TRACE_IRQS_OFF
#else #else
# define preempt_stop() # define preempt_stop()
@ -84,7 +84,7 @@ ENTRY(ret_from_irq)
get_current_thread_info r8, r0 get_current_thread_info r8, r0
bt resume_kernel ! Yes, it's from kernel, go back soon bt resume_kernel ! Yes, it's from kernel, go back soon
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPTION
bra resume_userspace bra resume_userspace
nop nop
ENTRY(resume_kernel) ENTRY(resume_kernel)