Messages in this thread Patch in this message | | | Date | Sun, 08 Dec 2019 14:58:35 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: sched/urgent] sched/rt, ARC: Use CONFIG_PREEMPTION |
| |
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 916591722c7543570843b54d5896121146b498f5 Gitweb: https://git.kernel.org/tip/916591722c7543570843b54d5896121146b498f5 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 15 Oct 2019 21:17:51 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Sun, 08 Dec 2019 14:37:32 +01:00
sched/rt, ARC: 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: Vineet Gupta <vgupta@synopsys.com> Cc: linux-snps-arc@lists.infradead.org Link: https://lore.kernel.org/r/20191015191821.11479-5-bigeasy@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/arc/kernel/entry.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S index 72be012..1f6bb18 100644 --- a/arch/arc/kernel/entry.S +++ b/arch/arc/kernel/entry.S @@ -337,11 +337,11 @@ resume_user_mode_begin: resume_kernel_mode: ; Disable Interrupts from this point on - ; CONFIG_PREEMPT: This is a must for preempt_schedule_irq() - ; !CONFIG_PREEMPT: To ensure restore_regs is intr safe + ; CONFIG_PREEMPTION: This is a must for preempt_schedule_irq() + ; !CONFIG_PREEMPTION: To ensure restore_regs is intr safe IRQ_DISABLE r9 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION ; Can't preempt if preemption disabled GET_CURR_THR_INFO_FROM_SP r10
| |