Commit 8cc1e207 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

 - enable memtest functionality

 - defconfig updates

* tag 'm68k-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v5.16-rc1
  m68k: Enable memtest functionality
parents f0d43b3a 1a0ae068

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2940,7 +2940,7 @@ 
			both parameters are enabled, hugetlb_free_vmemmap takes

			precedence over memory_hotplug.memmap_on_memory.



	memtest=	[KNL,X86,ARM,PPC,RISCV] Enable memtest

	memtest=	[KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest

			Format: <integer>

			default : 0 <disable>

			Specifies the number of memtest passes to be

arch/m68k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config M68K 
	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_USE_MEMTEST if MMU_MOTOROLA

	select ARCH_WANT_IPC_PARSE_VERSION

	select BINFMT_FLAT_ARGVP_ENVP_ON_STACK

	select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE

arch/m68k/configs/amiga_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -317,7 +316,6 @@ CONFIG_PARPORT_1284=y 
CONFIG_AMIGA_FLOPPY=y

CONFIG_AMIGA_Z2RAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/apollo_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -307,7 +306,6 @@ CONFIG_DEVTMPFS_MOUNT=y 
CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_CONNECTOR=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

arch/m68k/configs/atari_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ CONFIG_MPLS_ROUTING=m 
CONFIG_MPLS_IPTUNNEL=m

CONFIG_NET_NSH=m

CONFIG_AF_KCM=m

CONFIG_MCTP=m

# CONFIG_WIRELESS is not set

CONFIG_PSAMPLE=m

CONFIG_NET_IFE=m
@@ -318,7 +317,6 @@ CONFIG_PARPORT_ATARI=m 
CONFIG_PARPORT_1284=y

CONFIG_ATARI_FLOPPY=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y