Commit 29ff6492 authored Oct 15, 2019 by Thomas Gleixner Committed by Ingo Molnar Dec 08, 2019

sched/rt, riscv: 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>
Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # for arch/riscv
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-riscv@lists.infradead.org
Link: https://lore.kernel.org/r/20191015191821.11479-17-bigeasy@linutronix.de


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

parent 09613e83

arch/riscv/kernel/entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ _save_context:
		REG_L x2, PT_SP(sp)
		.endm

		#if !IS_ENABLED(CONFIG_PREEMPT)
		#if !IS_ENABLED(CONFIG_PREEMPTION)
		.set resume_kernel, restore_all
		#endif

		@@ -304,7 +304,7 @@ restore_all:
		sret
		#endif

		#if IS_ENABLED(CONFIG_PREEMPT)
		#if IS_ENABLED(CONFIG_PREEMPTION)
		resume_kernel:
		REG_L s0, TASK_TI_PREEMPT_COUNT(tp)
		bnez s0, restore_all

Admin message