diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-08-14 00:31:33 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-08-16 20:04:24 -0400 |
| commit | 42b1b94635a467407841c89e91d9209c55f6bc61 (patch) | |
| tree | 7e712df4947dec644658f321ffe65b467d2c3200 /arch | |
| parent | e7d6582e04212943d23d6e42b86ede5d9a0ebe04 (diff) | |
m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types
There is no specific atomic64 support code for any m68k CPUs, so we should
select CONFIG_GENERIC_ATOMC64 for all. Remove the existing per CPU selection
of this and select it for all m68k.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Fengguang Wu <fengguang.wu@intel.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
| -rw-r--r-- | arch/m68k/Kconfig.cpu | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 4a469907f04a..b22df9410dce 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
| @@ -5,6 +5,7 @@ config M68K | |||
| 5 | select HAVE_AOUT if MMU | 5 | select HAVE_AOUT if MMU |
| 6 | select HAVE_GENERIC_HARDIRQS | 6 | select HAVE_GENERIC_HARDIRQS |
| 7 | select GENERIC_IRQ_SHOW | 7 | select GENERIC_IRQ_SHOW |
| 8 | select GENERIC_ATOMIC64 | ||
| 8 | select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS | 9 | select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS |
| 9 | select GENERIC_CPU_DEVICES | 10 | select GENERIC_CPU_DEVICES |
| 10 | select GENERIC_STRNCPY_FROM_USER if MMU | 11 | select GENERIC_STRNCPY_FROM_USER if MMU |
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 59eb9f359809..c4eb79edecec 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu | |||
| @@ -59,7 +59,6 @@ config MCPU32 | |||
| 59 | config M68020 | 59 | config M68020 |
| 60 | bool "68020 support" | 60 | bool "68020 support" |
| 61 | depends on MMU | 61 | depends on MMU |
| 62 | select GENERIC_ATOMIC64 | ||
| 63 | select CPU_HAS_ADDRESS_SPACES | 62 | select CPU_HAS_ADDRESS_SPACES |
| 64 | help | 63 | help |
| 65 | If you anticipate running this kernel on a computer with a MC68020 | 64 | If you anticipate running this kernel on a computer with a MC68020 |
| @@ -70,7 +69,6 @@ config M68020 | |||
| 70 | config M68030 | 69 | config M68030 |
| 71 | bool "68030 support" | 70 | bool "68030 support" |
| 72 | depends on MMU && !MMU_SUN3 | 71 | depends on MMU && !MMU_SUN3 |
| 73 | select GENERIC_ATOMIC64 | ||
| 74 | select CPU_HAS_ADDRESS_SPACES | 72 | select CPU_HAS_ADDRESS_SPACES |
| 75 | help | 73 | help |
| 76 | If you anticipate running this kernel on a computer with a MC68030 | 74 | If you anticipate running this kernel on a computer with a MC68030 |
| @@ -80,7 +78,6 @@ config M68030 | |||
| 80 | config M68040 | 78 | config M68040 |
| 81 | bool "68040 support" | 79 | bool "68040 support" |
| 82 | depends on MMU && !MMU_SUN3 | 80 | depends on MMU && !MMU_SUN3 |
| 83 | select GENERIC_ATOMIC64 | ||
| 84 | select CPU_HAS_ADDRESS_SPACES | 81 | select CPU_HAS_ADDRESS_SPACES |
| 85 | help | 82 | help |
| 86 | If you anticipate running this kernel on a computer with a MC68LC040 | 83 | If you anticipate running this kernel on a computer with a MC68LC040 |
| @@ -91,7 +88,6 @@ config M68040 | |||
| 91 | config M68060 | 88 | config M68060 |
| 92 | bool "68060 support" | 89 | bool "68060 support" |
| 93 | depends on MMU && !MMU_SUN3 | 90 | depends on MMU && !MMU_SUN3 |
| 94 | select GENERIC_ATOMIC64 | ||
| 95 | select CPU_HAS_ADDRESS_SPACES | 91 | select CPU_HAS_ADDRESS_SPACES |
| 96 | help | 92 | help |
| 97 | If you anticipate running this kernel on a computer with a MC68060 | 93 | If you anticipate running this kernel on a computer with a MC68060 |