Commit 7462b759 authored Oct 15, 2019 by Thomas Gleixner Committed by Ingo Molnar Dec 08, 2019

sched/rt, h8300: 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.

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: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: uclinux-h8-devel@lists.sourceforge.jp
Link: https://lore.kernel.org/r/20191015191821.11479-8-bigeasy@linutronix.de


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

parent 365a795a

arch/h8300/kernel/entry.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -284,12 +284,12 @@ badsys:
		mov.l er0,@(LER0:16,sp)
		bra resume_userspace

		#if !defined(CONFIG_PREEMPT)
		#if !defined(CONFIG_PREEMPTION)
		#define resume_kernel restore_all
		#endif

		ret_from_exception:
		#if defined(CONFIG_PREEMPT)
		#if defined(CONFIG_PREEMPTION)
		orc #0xc0,ccr
		#endif
		ret_from_interrupt:
		@@ -319,7 +319,7 @@ work_resched:
		restore_all:
		RESTORE_ALL /* Does RTE */

		#if defined(CONFIG_PREEMPT)
		#if defined(CONFIG_PREEMPTION)
		resume_kernel:
		mov.l @(TI_PRE_COUNT:16,er4),er0
		bne restore_all:8

Admin message