m68k: selection of GENERIC_ATOMIC64 is not MMU specific

The selection of the CONFIG_GENERIC_ATOMIC64 option is no specific to
the MMU being present and enabled. It is a property of certain CPU
families. So select it based on those CPU types being selected.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6c28582fb98f5559a39c3a0122104c561d4fa573..26ed01bdf25046769f5775471bd6ecd1aa9eb817 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -3,7 +3,6 @@ config M68K
        default y
        select HAVE_IDE
        select HAVE_AOUT if MMU
-       select GENERIC_ATOMIC64 if MMU
        select HAVE_GENERIC_HARDIRQS if !MMU
        select GENERIC_IRQ_SHOW if !MMU
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index e632b2d1210615d89aa74490a8e8cbf2d8897b97..9af9e68c303ba76372d6fe7206d1d86f254f89c0 100644 (file)
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -33,6 +33,7 @@ config COLDFIRE
 config M68020
        bool "68020 support"
        depends on MMU
+       select GENERIC_ATOMIC64
        help
          If you anticipate running this kernel on a computer with a MC68020
          processor, say Y. Otherwise, say N. Note that the 68020 requires a
@@ -42,6 +43,7 @@ config M68020
 config M68030
        bool "68030 support"
        depends on MMU && !MMU_SUN3
+       select GENERIC_ATOMIC64
        help
          If you anticipate running this kernel on a computer with a MC68030
          processor, say Y. Otherwise, say N. Note that a MC68EC030 will not
@@ -50,6 +52,7 @@ config M68030
 config M68040
        bool "68040 support"
        depends on MMU && !MMU_SUN3
+       select GENERIC_ATOMIC64
        help
          If you anticipate running this kernel on a computer with a MC68LC040
          or MC68040 processor, say Y. Otherwise, say N. Note that an
@@ -59,6 +62,7 @@ config M68040
 config M68060
        bool "68060 support"
        depends on MMU && !MMU_SUN3
+       select GENERIC_ATOMIC64
        help
          If you anticipate running this kernel on a computer with a MC68060
          processor, say Y. Otherwise, say N.