Merge tag 'm68knommu-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull m68knommu updates from Greg Ungerer:
 "A collection of fixes for 5.10:

   - switch to using asm-generic uaccess code

   - fix sparse warnings in signal code

   - fix compilation of ColdFire MMC support

   - support sysrq in ColdFire serial driver"

* tag 'm68knommu-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  serial: mcf: add sysrq capability
  m68knommu: include SDHC support only when hardware has it
  m68knommu: fix sparse warnings in signal code
  m68knommu: switch to using asm-generic/uaccess.h

diff --cc arch/m68k/Kconfig
index 93bbb74,aefffeb..c830705
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -6,32 -6,33 +6,33 @@@ config M68
        select ARCH_HAS_BINFMT_FLAT
        select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
 +      select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
        select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
        select ARCH_NO_PREEMPT if !COLDFIRE
 +      select ARCH_WANT_IPC_PARSE_VERSION
        select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
        select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE
 -      select HAVE_IDE
 -      select HAVE_AOUT if MMU
 -      select HAVE_ASM_MODVERSIONS
 -      select HAVE_DEBUG_BUGVERBOSE
 -      select GENERIC_IRQ_SHOW
        select GENERIC_ATOMIC64
 -      select NO_DMA if !MMU && !COLDFIRE
 -      select HAVE_UID16
 -      select VIRT_TO_BUS
 -      select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
        select GENERIC_CPU_DEVICES
        select GENERIC_IOMAP
 +      select GENERIC_IRQ_SHOW
        select GENERIC_STRNCPY_FROM_USER if MMU
        select GENERIC_STRNLEN_USER if MMU
 -      select UACCESS_MEMCPY if !MMU
 -      select ARCH_WANT_IPC_PARSE_VERSION
 +      select HAVE_AOUT if MMU
 +      select HAVE_ASM_MODVERSIONS
 +      select HAVE_DEBUG_BUGVERBOSE
        select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
 +      select HAVE_IDE
        select HAVE_MOD_ARCH_SPECIFIC
 +      select HAVE_UID16
 +      select MMU_GATHER_NO_RANGE if MMU
        select MODULES_USE_ELF_REL
        select MODULES_USE_ELF_RELA
 -      select OLD_SIGSUSPEND3
 +      select NO_DMA if !MMU && !COLDFIRE
        select OLD_SIGACTION
 -      select MMU_GATHER_NO_RANGE if MMU
 +      select OLD_SIGSUSPEND3
++      select UACCESS_MEMCPY if !MMU
 +      select VIRT_TO_BUS
  
  config CPU_BIG_ENDIAN
        def_bool y