Commit 1338acfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68k updates from Geert Uytterhoeven:

 - Fix invalid context sleep and reboot hang on Mac

 - Fix spinlock race in kernel thread creation

 - Miscellaneous fixes and improvements

 - defconfig updates

* tag 'm68k-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.9-rc1
  m68k: Move ARCH_HAS_CPU_CACHE_ALIASING
  m68k: mac: Fix reboot hang on Mac IIci
  m68k: Fix spinlock race in kernel thread creation
  m68k: Let GENERIC_IOMAP depend on HAS_IOPORT
  m68k: amiga: Use str_plural() to fix Coccinelle warning
  macintosh/via-macii: Fix "BUG: sleeping function called from invalid context"
  zorro: Use helpers from ioport.h
  m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER
parents 9776dd36 ec8c8266

arch/m68k/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ config M68K 
	bool

	default y

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_CPU_CACHE_ALIASING

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_CPU_CACHE_ALIASING

	select ARCH_HAS_CPU_FINALIZE_INIT if MMU

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DMA_PREP_COHERENT if M68K_NONCOHERENT_DMA && !COLDFIRE
@@ -18,7 +18,7 @@ config M68K 
	select DMA_DIRECT_REMAP if M68K_NONCOHERENT_DMA && !COLDFIRE

	select GENERIC_ATOMIC64

	select GENERIC_CPU_DEVICES

	select GENERIC_IOMAP

	select GENERIC_IOMAP if HAS_IOPORT

	select GENERIC_IRQ_SHOW

	select GENERIC_LIB_ASHLDI3

	select GENERIC_LIB_ASHRDI3

arch/m68k/amiga/config.c

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ static void amiga_get_hardware_list(struct seq_file *m) 
		seq_printf(m, "\tZorro II%s AutoConfig: %d Expansion "

				"Device%s\n",

				AMIGAHW_PRESENT(ZORRO3) ? "I" : "",

				zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");

				zorro_num_autocon, str_plural(zorro_num_autocon));

#endif /* CONFIG_ZORRO */



#undef AMIGAHW_ANNOUNCE

arch/m68k/configs/amiga_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y 
CONFIG_SERIAL_CONSOLE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ATARI_PARTITION=y

CONFIG_MAC_PARTITION=y
@@ -217,7 +218,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -624,8 +624,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

arch/m68k/configs/apollo_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ CONFIG_HEARTBEAT=y 
CONFIG_PROC_HARDWARE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y
@@ -213,7 +214,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -581,8 +581,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

arch/m68k/configs/atari_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ CONFIG_ATARI_ETHERNEC=y 
CONFIG_ATARI_DSP56K=m

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_MAC_PARTITION=y
@@ -220,7 +221,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -601,8 +601,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m