diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-10-15 21:18:01 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:34 +0100 |
| commit | f0365eb50b04de91d0119619026865ba2a352a34 (patch) | |
| tree | 788afb1eddde165ab8c85b5b853b82c987c8e206 /arch/nios2 | |
| parent | sched/rt, nds32: Use CONFIG_PREEMPTION (diff) | |
| download | linux-dev-f0365eb50b04de91d0119619026865ba2a352a34.tar.xz linux-dev-f0365eb50b04de91d0119619026865ba2a352a34.zip | |
sched/rt, nios2: 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: Ley Foon Tan <lftan@altera.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: nios2-dev@lists.rocketboards.org
Link: https://lore.kernel.org/r/20191015191821.11479-15-bigeasy@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/kernel/entry.S b/arch/nios2/kernel/entry.S index 1e515ccd698e..3d8d1d0bcb64 100644 --- a/arch/nios2/kernel/entry.S +++ b/arch/nios2/kernel/entry.S @@ -365,7 +365,7 @@ ENTRY(ret_from_interrupt) ldw r1, PT_ESTATUS(sp) /* check if returning to kernel */ TSTBNZ r1, r1, ESTATUS_EU, Luser_return -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION GET_THREAD_INFO r1 ldw r4, TI_PREEMPT_COUNT(r1) bne r4, r0, restore_all |