diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-10-15 21:17:57 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2019-11-11 10:54:40 +1000 |
| commit | 3ad3cbe305b5a23d829d3723b60be59c36713992 (patch) | |
| tree | 7eed9f63bbfe42e1b87607c0f3965de0f0464924 /arch/m68k | |
| parent | 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c (diff) | |
| download | linux-stable-3ad3cbe305b5a23d829d3723b60be59c36713992.tar.gz linux-stable-3ad3cbe305b5a23d829d3723b60be59c36713992.tar.bz2 linux-stable-3ad3cbe305b5a23d829d3723b60be59c36713992.zip | |
m68k/coldfire: 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.
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S index 52d312d5b4d4..d43a02795a4a 100644 --- a/arch/m68k/coldfire/entry.S +++ b/arch/m68k/coldfire/entry.S @@ -108,7 +108,7 @@ ret_from_exception: btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */ jeq Luser_return /* if so, skip resched, signals */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION movel %sp,%d1 /* get thread_info pointer */ andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ movel %d1,%a0 |