Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[firefly-linux-kernel-4.4.55.git] / arch / m68k / Kconfig

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index d66e34c718d0927a6eba9daa9a023b7e3bcd228a..9e8ee9d2b8ca3c55ce540aee8addcbf308ea9e06 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -6,6 +6,7 @@ config M68K
        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
 
 config RWSEM_GENERIC_SPINLOCK
        bool
@@ -41,6 +42,10 @@ config NO_DMA
 config ZONE_DMA
        bool
        default y
+
+config CPU_HAS_NO_BITFIELDS
+       bool
+
 config HZ
        int
        default 1000 if CLEOPATRA