| Date | Sun, 08 Dec 2019 14:58:33 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: sched/urgent] sched/rt, microblaze: Use CONFIG_PREEMPTION |
| |
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 18803733bd67b8e8f608a0bbb491e1491dcce01e Gitweb: https://git.kernel.org/tip/18803733bd67b8e8f608a0bbb491e1491dcce01e Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 15 Oct 2019 21:17:58 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00
sched/rt, microblaze: 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: Michal Simek <monstr@monstr.eu> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20191015191821.11479-12-bigeasy@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/microblaze/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S index de7083b..f6ded35 100644 --- a/arch/microblaze/kernel/entry.S +++ b/arch/microblaze/kernel/entry.S @@ -728,7 +728,7 @@ no_intr_resched: bri 6f; /* MS: Return to kernel state. */ 2: -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION lwi r11, CURRENT_TASK, TS_THREAD_INFO; /* MS: get preempt_count from thread info */ lwi r5, r11, TI_PREEMPT_COUNT;
|