sched/rt, MIPS: Use CONFIG_PREEMPTION (098fa51b) · 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 and assmebly macros 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: James Hogan <jhogan@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul Burton <paul.burton@mips.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@vger.kernel.org Link: https://lore.kernel.org/r/20191015191821.11479-13-bigeasy@linutronix.de Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/mips/include/asm/asmmacro.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		.endm

		.macro local_irq_disable reg=t0
		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		lw \reg, TI_PRE_COUNT($28)
		addi \reg, \reg, 1
		sw \reg, TI_PRE_COUNT($28)
		@@ -73,7 +73,7 @@
		xori \reg, \reg, 1
		mtc0 \reg, CP0_STATUS
		irq_disable_hazard
		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		lw \reg, TI_PRE_COUNT($28)
		addi \reg, \reg, -1
		sw \reg, TI_PRE_COUNT($28)

arch/mips/kernel/entry.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		#include <asm/thread_info.h>
		#include <asm/war.h>

		#ifndef CONFIG_PREEMPT
		#ifndef CONFIG_PREEMPTION
		#define resume_kernel restore_all
		#else
		#define __ret_from_irq ret_from_exception
		@@ -27,7 +27,7 @@

		.text
		.align 5
		#ifndef CONFIG_PREEMPT
		#ifndef CONFIG_PREEMPTION
		FEXPORT(ret_from_exception)
		local_irq_disable # preempt stop
		b __ret_from_irq
		@@ -53,7 +53,7 @@ resume_userspace:
		bnez t0, work_pending
		j restore_all

		#ifdef CONFIG_PREEMPT
		#ifdef CONFIG_PREEMPTION
		resume_kernel:
		local_irq_disable
		lw t0, TI_PRE_COUNT($28)

Admin message