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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas 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.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index b16237c95ea33bd1fb75f50b91fbd6ae053b1687..593e4014cef84bc2e9c0065bcf86af144aac5881 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -81,7 +81,7 @@ config STACK_GROWSUP
 config GENERIC_LOCKBREAK
        bool
        default y
-       depends on SMP && PREEMPT
+       depends on SMP && PREEMPTION
 
 config ARCH_HAS_ILOG2_U32
        bool

diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index b96d7449697791260fdf2a28985ba7174f412668..9a03e29c87330f3f00228ccdec62c40f9cbab2aa 100644 (file)
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -940,14 +940,14 @@ intr_restore:
        rfi
        nop
 
-#ifndef CONFIG_PREEMPT
+#ifndef CONFIG_PREEMPTION
 # define intr_do_preempt       intr_restore
-#endif /* !CONFIG_PREEMPT */
+#endif /* !CONFIG_PREEMPTION */
 
        .import schedule,code
 intr_do_resched:
        /* 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.
         */
        LDREG   PT_IASQ0(%r16), %r20
@@ -979,7 +979,7 @@ intr_do_resched:
         * and preempt_count is 0. otherwise, we continue on
         * our merry way back to the current running task.
         */
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPTION
        .import preempt_schedule_irq,code
 intr_do_preempt:
        rsm     PSW_SM_I, %r0           /* disable interrupts */
@@ -999,7 +999,7 @@ intr_do_preempt:
        nop
 
        b,n     intr_restore            /* ssm PSW_SM_I done by intr_restore */
-#endif /* CONFIG_PREEMPT */
+#endif /* CONFIG_PREEMPTION */
 
        /*
         * External interrupts.