Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b881a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu arch fixes from Greg Ungerer:
 "This contains 2 fixes.  One fixes compilation of ColdFire clk code,
  the other makes sure we use the generic atomic64 support on all m68k
  targets."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types
  m68knommu: select CONFIG_HAVE_CLK for ColdFire CPU types
parents 8f6c1ca9 42b1b946

arch/m68k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config M68K 
	select HAVE_AOUT if MMU

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_SHOW

	select GENERIC_ATOMIC64

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

	select GENERIC_CPU_DEVICES

	select GENERIC_STRNCPY_FROM_USER if MMU

arch/m68k/Kconfig.cpu

+1 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config COLDFIRE 
	select CPU_HAS_NO_BITFIELDS

	select CPU_HAS_NO_MULDIV64

	select GENERIC_CSUM

	select HAVE_CLK



endchoice
@@ -58,7 +59,6 @@ config MCPU32 
config M68020

	bool "68020 support"

	depends on MMU

	select GENERIC_ATOMIC64

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68020
@@ -69,7 +69,6 @@ config M68020 
config M68030

	bool "68030 support"

	depends on MMU && !MMU_SUN3

	select GENERIC_ATOMIC64

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68030
@@ -79,7 +78,6 @@ config M68030 
config M68040

	bool "68040 support"

	depends on MMU && !MMU_SUN3

	select GENERIC_ATOMIC64

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68LC040
@@ -90,7 +88,6 @@ config M68040 
config M68060

	bool "68060 support"

	depends on MMU && !MMU_SUN3

	select GENERIC_ATOMIC64

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68060