diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-10-15 21:17:54 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:33 +0100 |
| commit | 7462b759b1c2fc3848fe54f71bf553f8f4e6d323 (patch) | |
| tree | d42ab078c5b02258e485d03edf70ba46c1bc78cd /arch/h8300 | |
| parent | sched/rt, csky: Use CONFIG_PREEMPTION (diff) | |
| download | wireguard-linux-7462b759b1c2fc3848fe54f71bf553f8f4e6d323.tar.xz wireguard-linux-7462b759b1c2fc3848fe54f71bf553f8f4e6d323.zip | |
sched/rt, h8300: 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: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: uclinux-h8-devel@lists.sourceforge.jp
Link: https://lore.kernel.org/r/20191015191821.11479-8-bigeasy@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/kernel/entry.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/h8300/kernel/entry.S b/arch/h8300/kernel/entry.S index 4ade5f8299ba..c6e289b5f1f2 100644 --- a/arch/h8300/kernel/entry.S +++ b/arch/h8300/kernel/entry.S @@ -284,12 +284,12 @@ badsys: mov.l er0,@(LER0:16,sp) bra resume_userspace -#if !defined(CONFIG_PREEMPT) +#if !defined(CONFIG_PREEMPTION) #define resume_kernel restore_all #endif ret_from_exception: -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) orc #0xc0,ccr #endif ret_from_interrupt: @@ -319,7 +319,7 @@ work_resched: restore_all: RESTORE_ALL /* Does RTE */ -#if defined(CONFIG_PREEMPT) +#if defined(CONFIG_PREEMPTION) resume_kernel: mov.l @(TI_PRE_COUNT:16,er4),er0 bne restore_all:8 |