Commit 09613e83 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

sched/rt, parisc: 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.

[bigeasy: +Kconfig]
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Helge Deller <deller@gmx.de>
Cc: James E.J. Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-parisc@vger.kernel.org
Link: https://lore.kernel.org/r/20191015191821.11479-16-bigeasy@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f0365eb5
...@@ -81,7 +81,7 @@ config STACK_GROWSUP ...@@ -81,7 +81,7 @@ config STACK_GROWSUP
config GENERIC_LOCKBREAK config GENERIC_LOCKBREAK
bool bool
default y default y
depends on SMP && PREEMPT depends on SMP && PREEMPTION
config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U32
bool bool
......
...@@ -940,14 +940,14 @@ intr_restore: ...@@ -940,14 +940,14 @@ intr_restore:
rfi rfi
nop nop
#ifndef CONFIG_PREEMPT #ifndef CONFIG_PREEMPTION
# define intr_do_preempt intr_restore # define intr_do_preempt intr_restore
#endif /* !CONFIG_PREEMPT */ #endif /* !CONFIG_PREEMPTION */
.import schedule,code .import schedule,code
intr_do_resched: intr_do_resched:
/* Only call schedule on return to userspace. If we're returning /* Only call schedule on return to userspace. If we're returning
* to kernel space, we may schedule if CONFIG_PREEMPT, otherwise * to kernel space, we may schedule if CONFIG_PREEMPTION, otherwise
* we jump back to intr_restore. * we jump back to intr_restore.
*/ */
LDREG PT_IASQ0(%r16), %r20 LDREG PT_IASQ0(%r16), %r20
...@@ -979,7 +979,7 @@ intr_do_resched: ...@@ -979,7 +979,7 @@ intr_do_resched:
* and preempt_count is 0. otherwise, we continue on * and preempt_count is 0. otherwise, we continue on
* our merry way back to the current running task. * our merry way back to the current running task.
*/ */
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPTION
.import preempt_schedule_irq,code .import preempt_schedule_irq,code
intr_do_preempt: intr_do_preempt:
rsm PSW_SM_I, %r0 /* disable interrupts */ rsm PSW_SM_I, %r0 /* disable interrupts */
...@@ -999,7 +999,7 @@ intr_do_preempt: ...@@ -999,7 +999,7 @@ intr_do_preempt:
nop nop
b,n intr_restore /* ssm PSW_SM_I done by intr_restore */ b,n intr_restore /* ssm PSW_SM_I done by intr_restore */
#endif /* CONFIG_PREEMPT */ #endif /* CONFIG_PREEMPTION */
/* /*
* External interrupts. * External interrupts.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment