sched/rt, powerpc: Use CONFIG_PREEMPTION (fdc5569e) · Commits · 戴 / test

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> Acked-by:

Michael Ellerman <mpe@ellerman.id.au> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: linuxppc-dev@lists.ozlabs.org Link: https://lore.kernel.org/r/20191024160458.vlnf3wlcyjl2ich7@linutronix.de Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/powerpc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT
		config GENERIC_LOCKBREAK
		bool
		default y
		depends on SMP && PREEMPT
		depends on SMP && PREEMPTION

		config GENERIC_HWEIGHT
		bool

arch/powerpc/kernel/entry_32.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -897,7 +897,7 @@ resume_kernel:
		bne- 0b
		1:

		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		/* check current_thread_info->preempt_count */
		lwz r0,TI_PREEMPT(r2)
		cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
		@@ -921,7 +921,7 @@ resume_kernel:
		*/
		bl trace_hardirqs_on
		#endif
		#endif /* CONFIG_PREEMPT */
		#endif /* CONFIG_PREEMPTION */
		restore_kuap:
		kuap_restore r1, r2, r9, r10, r0

arch/powerpc/kernel/entry_64.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -846,7 +846,7 @@ resume_kernel:
		bne- 0b
		1:

		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		/* Check if we need to preempt */
		andi. r0,r4,_TIF_NEED_RESCHED
		beq+ restore
		@@ -877,7 +877,7 @@ resume_kernel:
		li r10,MSR_RI
		mtmsrd r10,1 /* Update machine state */
		#endif /* CONFIG_PPC_BOOK3E */
		#endif /* CONFIG_PREEMPT */
		#endif /* CONFIG_PREEMPTION */

		.globl fast_exc_return_irq
		fast_exc_return_irq:

Admin message