Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a6b881a5b8d4fa2135e55a74be6d6b1e17e445dd

Authored by Linus Torvalds
2 parents 8f6c1ca9be 42b1b94635

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

Showing 2 changed files Side-by-side Diff

... ... @@ -5,6 +5,7 @@
5 5 select HAVE_AOUT if MMU
6 6 select HAVE_GENERIC_HARDIRQS
7 7 select GENERIC_IRQ_SHOW
  8 + select GENERIC_ATOMIC64
8 9 select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
9 10 select GENERIC_CPU_DEVICES
10 11 select GENERIC_STRNCPY_FROM_USER if MMU
arch/m68k/Kconfig.cpu
Diff comments   View file @ a6b881a
... ... @@ -28,6 +28,7 @@
28 28 select CPU_HAS_NO_BITFIELDS
29 29 select CPU_HAS_NO_MULDIV64
30 30 select GENERIC_CSUM
  31 + select HAVE_CLK
31 32  
32 33 endchoice
33 34  
... ... @@ -58,7 +59,6 @@
58 59 config M68020
59 60 bool "68020 support"
60 61 depends on MMU
61   - select GENERIC_ATOMIC64
62 62 select CPU_HAS_ADDRESS_SPACES
63 63 help
64 64 If you anticipate running this kernel on a computer with a MC68020
... ... @@ -69,7 +69,6 @@
69 69 config M68030
70 70 bool "68030 support"
71 71 depends on MMU && !MMU_SUN3
72   - select GENERIC_ATOMIC64
73 72 select CPU_HAS_ADDRESS_SPACES
74 73 help
75 74 If you anticipate running this kernel on a computer with a MC68030
... ... @@ -79,7 +78,6 @@
79 78 config M68040
80 79 bool "68040 support"
81 80 depends on MMU && !MMU_SUN3
82   - select GENERIC_ATOMIC64
83 81 select CPU_HAS_ADDRESS_SPACES
84 82 help
85 83 If you anticipate running this kernel on a computer with a MC68LC040
... ... @@ -90,7 +88,6 @@
90 88 config M68060
91 89 bool "68060 support"
92 90 depends on MMU && !MMU_SUN3
93   - select GENERIC_ATOMIC64
94 91 select CPU_HAS_ADDRESS_SPACES
95 92 help
96 93 If you anticipate running this kernel on a computer with a MC68060