Skip to content

Commit 1338acf

Browse files
torvaldstorvalds
committed
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
2 parents 9776dd3 + ec8c826 commit 1338acf

File tree

19 files changed

+48
-80
lines changed

19 files changed

+48
-80
lines changed

‎arch/m68k/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ config M68K
33
bool
44
default y
55
select ARCH_32BIT_OFF_T
6-
select ARCH_HAS_CPU_CACHE_ALIASING
76
select ARCH_HAS_BINFMT_FLAT
7+
select ARCH_HAS_CPU_CACHE_ALIASING
88
select ARCH_HAS_CPU_FINALIZE_INIT if MMU
99
select ARCH_HAS_CURRENT_STACK_POINTER
1010
select ARCH_HAS_DMA_PREP_COHERENT if M68K_NONCOHERENT_DMA && !COLDFIRE
@@ -18,7 +18,7 @@ config M68K
1818
select DMA_DIRECT_REMAP if M68K_NONCOHERENT_DMA && !COLDFIRE
1919
select GENERIC_ATOMIC64
2020
select GENERIC_CPU_DEVICES
21-
select GENERIC_IOMAP
21+
select GENERIC_IOMAP if HAS_IOPORT
2222
select GENERIC_IRQ_SHOW
2323
select GENERIC_LIB_ASHLDI3
2424
select GENERIC_LIB_ASHRDI3

‎arch/m68k/amiga/config.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ static void amiga_get_hardware_list(struct seq_file *m)
836836
seq_printf(m, "\tZorro II%s AutoConfig: %d Expansion "
837837
"Device%s\n",
838838
AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
839-
zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
839+
zorro_num_autocon, str_plural(zorro_num_autocon));
840840
#endif /* CONFIG_ZORRO */
841841

842842
#undef AMIGAHW_ANNOUNCE

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y
2626
CONFIG_SERIAL_CONSOLE=y
2727
CONFIG_MODULES=y
2828
CONFIG_MODULE_UNLOAD=y
29+
CONFIG_TRIM_UNUSED_KSYMS=y
2930
CONFIG_PARTITION_ADVANCED=y
3031
CONFIG_ATARI_PARTITION=y
3132
CONFIG_MAC_PARTITION=y
@@ -217,7 +218,6 @@ CONFIG_IP_NF_MANGLE=m
217218
CONFIG_IP_NF_TARGET_ECN=m
218219
CONFIG_IP_NF_TARGET_TTL=m
219220
CONFIG_IP_NF_RAW=m
220-
CONFIG_IP_NF_ARPTABLES=m
221221
CONFIG_IP_NF_ARPFILTER=m
222222
CONFIG_IP_NF_ARP_MANGLE=m
223223
CONFIG_NFT_DUP_IPV6=m
@@ -624,8 +624,6 @@ CONFIG_REED_SOLOMON_TEST=m
624624
CONFIG_ATOMIC64_SELFTEST=m
625625
CONFIG_ASYNC_RAID6_TEST=m
626626
CONFIG_TEST_HEXDUMP=m
627-
CONFIG_STRING_SELFTEST=m
628-
CONFIG_TEST_STRING_HELPERS=m
629627
CONFIG_TEST_KSTRTOX=m
630628
CONFIG_TEST_PRINTF=m
631629
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ CONFIG_HEARTBEAT=y
2121
CONFIG_PROC_HARDWARE=y
2222
CONFIG_MODULES=y
2323
CONFIG_MODULE_UNLOAD=y
24+
CONFIG_TRIM_UNUSED_KSYMS=y
2425
CONFIG_PARTITION_ADVANCED=y
2526
CONFIG_AMIGA_PARTITION=y
2627
CONFIG_ATARI_PARTITION=y
@@ -213,7 +214,6 @@ CONFIG_IP_NF_MANGLE=m
213214
CONFIG_IP_NF_TARGET_ECN=m
214215
CONFIG_IP_NF_TARGET_TTL=m
215216
CONFIG_IP_NF_RAW=m
216-
CONFIG_IP_NF_ARPTABLES=m
217217
CONFIG_IP_NF_ARPFILTER=m
218218
CONFIG_IP_NF_ARP_MANGLE=m
219219
CONFIG_NFT_DUP_IPV6=m
@@ -581,8 +581,6 @@ CONFIG_REED_SOLOMON_TEST=m
581581
CONFIG_ATOMIC64_SELFTEST=m
582582
CONFIG_ASYNC_RAID6_TEST=m
583583
CONFIG_TEST_HEXDUMP=m
584-
CONFIG_STRING_SELFTEST=m
585-
CONFIG_TEST_STRING_HELPERS=m
586584
CONFIG_TEST_KSTRTOX=m
587585
CONFIG_TEST_PRINTF=m
588586
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONFIG_ATARI_ETHERNEC=y
2929
CONFIG_ATARI_DSP56K=m
3030
CONFIG_MODULES=y
3131
CONFIG_MODULE_UNLOAD=y
32+
CONFIG_TRIM_UNUSED_KSYMS=y
3233
CONFIG_PARTITION_ADVANCED=y
3334
CONFIG_AMIGA_PARTITION=y
3435
CONFIG_MAC_PARTITION=y
@@ -220,7 +221,6 @@ CONFIG_IP_NF_MANGLE=m
220221
CONFIG_IP_NF_TARGET_ECN=m
221222
CONFIG_IP_NF_TARGET_TTL=m
222223
CONFIG_IP_NF_RAW=m
223-
CONFIG_IP_NF_ARPTABLES=m
224224
CONFIG_IP_NF_ARPFILTER=m
225225
CONFIG_IP_NF_ARP_MANGLE=m
226226
CONFIG_NFT_DUP_IPV6=m
@@ -601,8 +601,6 @@ CONFIG_REED_SOLOMON_TEST=m
601601
CONFIG_ATOMIC64_SELFTEST=m
602602
CONFIG_ASYNC_RAID6_TEST=m
603603
CONFIG_TEST_HEXDUMP=m
604-
CONFIG_STRING_SELFTEST=m
605-
CONFIG_TEST_STRING_HELPERS=m
606604
CONFIG_TEST_KSTRTOX=m
607605
CONFIG_TEST_PRINTF=m
608606
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ CONFIG_BVME6000=y
1919
CONFIG_PROC_HARDWARE=y
2020
CONFIG_MODULES=y
2121
CONFIG_MODULE_UNLOAD=y
22+
CONFIG_TRIM_UNUSED_KSYMS=y
2223
CONFIG_PARTITION_ADVANCED=y
2324
CONFIG_AMIGA_PARTITION=y
2425
CONFIG_ATARI_PARTITION=y
@@ -210,7 +211,6 @@ CONFIG_IP_NF_MANGLE=m
210211
CONFIG_IP_NF_TARGET_ECN=m
211212
CONFIG_IP_NF_TARGET_TTL=m
212213
CONFIG_IP_NF_RAW=m
213-
CONFIG_IP_NF_ARPTABLES=m
214214
CONFIG_IP_NF_ARPFILTER=m
215215
CONFIG_IP_NF_ARP_MANGLE=m
216216
CONFIG_NFT_DUP_IPV6=m
@@ -573,8 +573,6 @@ CONFIG_REED_SOLOMON_TEST=m
573573
CONFIG_ATOMIC64_SELFTEST=m
574574
CONFIG_ASYNC_RAID6_TEST=m
575575
CONFIG_TEST_HEXDUMP=m
576-
CONFIG_STRING_SELFTEST=m
577-
CONFIG_TEST_STRING_HELPERS=m
578576
CONFIG_TEST_KSTRTOX=m
579577
CONFIG_TEST_PRINTF=m
580578
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CONFIG_HP300=y
2020
CONFIG_PROC_HARDWARE=y
2121
CONFIG_MODULES=y
2222
CONFIG_MODULE_UNLOAD=y
23+
CONFIG_TRIM_UNUSED_KSYMS=y
2324
CONFIG_PARTITION_ADVANCED=y
2425
CONFIG_AMIGA_PARTITION=y
2526
CONFIG_ATARI_PARTITION=y
@@ -212,7 +213,6 @@ CONFIG_IP_NF_MANGLE=m
212213
CONFIG_IP_NF_TARGET_ECN=m
213214
CONFIG_IP_NF_TARGET_TTL=m
214215
CONFIG_IP_NF_RAW=m
215-
CONFIG_IP_NF_ARPTABLES=m
216216
CONFIG_IP_NF_ARPFILTER=m
217217
CONFIG_IP_NF_ARP_MANGLE=m
218218
CONFIG_NFT_DUP_IPV6=m
@@ -583,8 +583,6 @@ CONFIG_REED_SOLOMON_TEST=m
583583
CONFIG_ATOMIC64_SELFTEST=m
584584
CONFIG_ASYNC_RAID6_TEST=m
585585
CONFIG_TEST_HEXDUMP=m
586-
CONFIG_STRING_SELFTEST=m
587-
CONFIG_TEST_STRING_HELPERS=m
588586
CONFIG_TEST_KSTRTOX=m
589587
CONFIG_TEST_PRINTF=m
590588
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CONFIG_MAC=y
2020
CONFIG_PROC_HARDWARE=y
2121
CONFIG_MODULES=y
2222
CONFIG_MODULE_UNLOAD=y
23+
CONFIG_TRIM_UNUSED_KSYMS=y
2324
CONFIG_PARTITION_ADVANCED=y
2425
CONFIG_AMIGA_PARTITION=y
2526
CONFIG_ATARI_PARTITION=y
@@ -211,7 +212,6 @@ CONFIG_IP_NF_MANGLE=m
211212
CONFIG_IP_NF_TARGET_ECN=m
212213
CONFIG_IP_NF_TARGET_TTL=m
213214
CONFIG_IP_NF_RAW=m
214-
CONFIG_IP_NF_ARPTABLES=m
215215
CONFIG_IP_NF_ARPFILTER=m
216216
CONFIG_IP_NF_ARP_MANGLE=m
217217
CONFIG_NFT_DUP_IPV6=m
@@ -600,8 +600,6 @@ CONFIG_REED_SOLOMON_TEST=m
600600
CONFIG_ATOMIC64_SELFTEST=m
601601
CONFIG_ASYNC_RAID6_TEST=m
602602
CONFIG_TEST_HEXDUMP=m
603-
CONFIG_STRING_SELFTEST=m
604-
CONFIG_TEST_STRING_HELPERS=m
605603
CONFIG_TEST_KSTRTOX=m
606604
CONFIG_TEST_PRINTF=m
607605
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y
4444
CONFIG_SERIAL_CONSOLE=y
4545
CONFIG_MODULES=y
4646
CONFIG_MODULE_UNLOAD=y
47+
CONFIG_TRIM_UNUSED_KSYMS=y
4748
CONFIG_PARTITION_ADVANCED=y
4849
CONFIG_BSD_DISKLABEL=y
4950
CONFIG_MINIX_SUBPARTITION=y
@@ -231,7 +232,6 @@ CONFIG_IP_NF_MANGLE=m
231232
CONFIG_IP_NF_TARGET_ECN=m
232233
CONFIG_IP_NF_TARGET_TTL=m
233234
CONFIG_IP_NF_RAW=m
234-
CONFIG_IP_NF_ARPTABLES=m
235235
CONFIG_IP_NF_ARPFILTER=m
236236
CONFIG_IP_NF_ARP_MANGLE=m
237237
CONFIG_NFT_DUP_IPV6=m
@@ -686,8 +686,6 @@ CONFIG_REED_SOLOMON_TEST=m
686686
CONFIG_ATOMIC64_SELFTEST=m
687687
CONFIG_ASYNC_RAID6_TEST=m
688688
CONFIG_TEST_HEXDUMP=m
689-
CONFIG_STRING_SELFTEST=m
690-
CONFIG_TEST_STRING_HELPERS=m
691689
CONFIG_TEST_KSTRTOX=m
692690
CONFIG_TEST_PRINTF=m
693691
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CONFIG_MVME147=y
1818
CONFIG_PROC_HARDWARE=y
1919
CONFIG_MODULES=y
2020
CONFIG_MODULE_UNLOAD=y
21+
CONFIG_TRIM_UNUSED_KSYMS=y
2122
CONFIG_PARTITION_ADVANCED=y
2223
CONFIG_AMIGA_PARTITION=y
2324
CONFIG_ATARI_PARTITION=y
@@ -209,7 +210,6 @@ CONFIG_IP_NF_MANGLE=m
209210
CONFIG_IP_NF_TARGET_ECN=m
210211
CONFIG_IP_NF_TARGET_TTL=m
211212
CONFIG_IP_NF_RAW=m
212-
CONFIG_IP_NF_ARPTABLES=m
213213
CONFIG_IP_NF_ARPFILTER=m
214214
CONFIG_IP_NF_ARP_MANGLE=m
215215
CONFIG_NFT_DUP_IPV6=m
@@ -572,8 +572,6 @@ CONFIG_REED_SOLOMON_TEST=m
572572
CONFIG_ATOMIC64_SELFTEST=m
573573
CONFIG_ASYNC_RAID6_TEST=m
574574
CONFIG_TEST_HEXDUMP=m
575-
CONFIG_STRING_SELFTEST=m
576-
CONFIG_TEST_STRING_HELPERS=m
577575
CONFIG_TEST_KSTRTOX=m
578576
CONFIG_TEST_PRINTF=m
579577
CONFIG_TEST_SCANF=m

0 commit comments

Comments
 (0)