From d8d7574d8452241dcd4b7db067162511a0f61794 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 19 Oct 2011 16:27:30 +1000 Subject: [PATCH] --- yaml --- r: 279702 b: refs/heads/master c: 5717a02becd2f5dae8b11cb5808de4e5369d607c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/Kconfig | 1 - trunk/arch/m68k/Kconfig.cpu | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 873585375000..c5dc499d30d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d25ba98afce7c87afa39f553a3ff8effed87db03 +refs/heads/master: 5717a02becd2f5dae8b11cb5808de4e5369d607c diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig index 361d54019bb0..2914b036d76e 100644 --- a/trunk/arch/m68k/Kconfig +++ b/trunk/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 select GENERIC_IRQ_SHOW select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS diff --git a/trunk/arch/m68k/Kconfig.cpu b/trunk/arch/m68k/Kconfig.cpu index e632b2d12106..9af9e68c303b 100644 --- a/trunk/arch/m68k/Kconfig.cpu +++ b/trunk/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.