tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a6b881a5 8f6c1ca9

+2 -4
+1
arch/m68k/Kconfig
··· 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
+1 -4
arch/m68k/Kconfig.cpu
··· 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 ··· 59 58 config M68020 60 59 bool "68020 support" 61 60 depends on MMU 62 - select GENERIC_ATOMIC64 63 61 select CPU_HAS_ADDRESS_SPACES 64 62 help 65 63 If you anticipate running this kernel on a computer with a MC68020 ··· 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 ··· 78 79 config M68040 79 80 bool "68040 support" 80 81 depends on MMU && !MMU_SUN3 81 - select GENERIC_ATOMIC64 82 82 select CPU_HAS_ADDRESS_SPACES 83 83 help 84 84 If you anticipate running this kernel on a computer with a MC68LC040 ··· 88 90 config M68060 89 91 bool "68060 support" 90 92 depends on MMU && !MMU_SUN3 91 - select GENERIC_ATOMIC64 92 93 select CPU_HAS_ADDRESS_SPACES 93 94 help 94 95 If you anticipate running this kernel on a computer with a MC68060