diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-05 12:20:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-05 12:20:42 -0800 |
| commit | 25cfb0c7de3f14e283a43dcd6de903657f9f98c7 (patch) | |
| tree | 9096a7106f99882c1bbdd07d5edca27c5260bf96 /arch | |
| parent | Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (diff) | |
| parent | m68k/coldfire: Use CONFIG_PREEMPTION (diff) | |
| download | linux-dev-25cfb0c7de3f14e283a43dcd6de903657f9f98c7.tar.xz linux-dev-25cfb0c7de3f14e283a43dcd6de903657f9f98c7.zip | |
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.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 |