Commit 365a795a authored Oct 15, 2019 by Thomas Gleixner Committed by Ingo Molnar Dec 08, 2019

sched/rt, csky: 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: Guo Ren <guoren@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20191015191821.11479-7-bigeasy@linutronix.de


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

parent 51466979

arch/csky/kernel/entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -277,7 +277,7 @@ ENTRY(csky_irq)
		zero_fp
		psrset ee

		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		mov r9, sp /* Get current stack pointer */
		bmaski r10, THREAD_SHIFT
		andn r9, r10 /* Get thread_info */
		@@ -294,7 +294,7 @@ ENTRY(csky_irq)
		mov a0, sp
		jbsr csky_do_IRQ

		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		subi r12, 1
		stw r12, (r9, TINFO_PREEMPT)
		cmpnei r12, 0

Admin message