summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-05 12:20:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-05 12:20:42 -0800
commit25cfb0c7de3f14e283a43dcd6de903657f9f98c7 (patch)
tree9096a7106f99882c1bbdd07d5edca27c5260bf96 /arch
parentb08baef02b26cf7c2123e4a24a2fa1fb7a593ffb (diff)
parent3ad3cbe305b5a23d829d3723b60be59c36713992 (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer: "Only a single change, to enable coldfire preemption entry code for all preemption types" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k/coldfire: Use CONFIG_PREEMPTION
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/coldfire/entry.S2
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