Commit 25cfb0c7 authored Dec 05, 2019 by Linus Torvalds

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

parents b08baef0 3ad3cbe3

arch/m68k/coldfire/entry.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message