summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-08 13:00:58 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-08 13:00:58 -0400
commit278ecbf027c3c559deb225f0cf53a23b7672dacf (patch)
tree16f57d6f94d0019e491ee446aac6f96ac05b110f /arch/m68k
parentdfd437a257924484b144ee750e60affc95562c6d (diff)
parent69878ef47562f32e02d0b7975c990e1c0339320d (diff)
Merge tag 'm68k-for-v5.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - switch to using the generic remapping DMA allocator - defconfig updates * tag 'm68k-for-v5.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Implement arch_dma_prep_coherent() m68k: Use the generic dma coherent remap allocator m68k: defconfig: Update defconfigs for v5.2-rc1
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/Kconfig3
-rw-r--r--arch/m68k/configs/amiga_defconfig17
-rw-r--r--arch/m68k/configs/apollo_defconfig17
-rw-r--r--arch/m68k/configs/atari_defconfig17
-rw-r--r--arch/m68k/configs/bvme6000_defconfig17
-rw-r--r--arch/m68k/configs/hp300_defconfig17
-rw-r--r--arch/m68k/configs/mac_defconfig17
-rw-r--r--arch/m68k/configs/multi_defconfig17
-rw-r--r--arch/m68k/configs/mvme147_defconfig17
-rw-r--r--arch/m68k/configs/mvme16x_defconfig17
-rw-r--r--arch/m68k/configs/q40_defconfig17
-rw-r--r--arch/m68k/configs/sun3_defconfig17
-rw-r--r--arch/m68k/configs/sun3x_defconfig17
-rw-r--r--arch/m68k/kernel/dma.c57
14 files changed, 98 insertions, 166 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 218e037ef901..00f5c98a5e05 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -3,10 +3,13 @@ config M68K
3 bool 3 bool
4 default y 4 default y
5 select ARCH_32BIT_OFF_T 5 select ARCH_32BIT_OFF_T
6 select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE
7 select ARCH_HAS_DMA_PREP_COHERENT
6 select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA 8 select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
7 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA 9 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
8 select ARCH_NO_COHERENT_DMA_MMAP if !MMU 10 select ARCH_NO_COHERENT_DMA_MMAP if !MMU
9 select ARCH_NO_PREEMPT if !COLDFIRE 11 select ARCH_NO_PREEMPT if !COLDFIRE
12 select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE
10 select HAVE_IDE 13 select HAVE_IDE
11 select HAVE_AOUT if MMU 14 select HAVE_AOUT if MMU
12 select HAVE_DEBUG_BUGVERBOSE 15 select HAVE_DEBUG_BUGVERBOSE
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index fea392cfcf1b..04e0f211afb3 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -71,9 +71,6 @@ CONFIG_INET_AH=m
71CONFIG_INET_ESP=m 71CONFIG_INET_ESP=m
72CONFIG_INET_ESP_OFFLOAD=m 72CONFIG_INET_ESP_OFFLOAD=m
73CONFIG_INET_IPCOMP=m 73CONFIG_INET_IPCOMP=m
74CONFIG_INET_XFRM_MODE_TRANSPORT=m
75CONFIG_INET_XFRM_MODE_TUNNEL=m
76CONFIG_INET_XFRM_MODE_BEET=m
77CONFIG_INET_DIAG=m 74CONFIG_INET_DIAG=m
78CONFIG_INET_UDP_DIAG=m 75CONFIG_INET_UDP_DIAG=m
79CONFIG_INET_RAW_DIAG=m 76CONFIG_INET_RAW_DIAG=m
@@ -205,7 +202,6 @@ CONFIG_IP_SET_HASH_NETNET=m
205CONFIG_IP_SET_HASH_NETPORT=m 202CONFIG_IP_SET_HASH_NETPORT=m
206CONFIG_IP_SET_HASH_NETIFACE=m 203CONFIG_IP_SET_HASH_NETIFACE=m
207CONFIG_IP_SET_LIST_SET=m 204CONFIG_IP_SET_LIST_SET=m
208CONFIG_NFT_CHAIN_ROUTE_IPV4=m
209CONFIG_NFT_DUP_IPV4=m 205CONFIG_NFT_DUP_IPV4=m
210CONFIG_NFT_FIB_IPV4=m 206CONFIG_NFT_FIB_IPV4=m
211CONFIG_NF_TABLES_ARP=y 207CONFIG_NF_TABLES_ARP=y
@@ -231,7 +227,6 @@ CONFIG_IP_NF_RAW=m
231CONFIG_IP_NF_ARPTABLES=m 227CONFIG_IP_NF_ARPTABLES=m
232CONFIG_IP_NF_ARPFILTER=m 228CONFIG_IP_NF_ARPFILTER=m
233CONFIG_IP_NF_ARP_MANGLE=m 229CONFIG_IP_NF_ARP_MANGLE=m
234CONFIG_NFT_CHAIN_ROUTE_IPV6=m
235CONFIG_NFT_DUP_IPV6=m 230CONFIG_NFT_DUP_IPV6=m
236CONFIG_NFT_FIB_IPV6=m 231CONFIG_NFT_FIB_IPV6=m
237CONFIG_NF_FLOW_TABLE_IPV6=m 232CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -308,7 +303,6 @@ CONFIG_AF_KCM=m
308# CONFIG_WIRELESS is not set 303# CONFIG_WIRELESS is not set
309CONFIG_PSAMPLE=m 304CONFIG_PSAMPLE=m
310CONFIG_NET_IFE=m 305CONFIG_NET_IFE=m
311# CONFIG_UEVENT_HELPER is not set
312CONFIG_DEVTMPFS=y 306CONFIG_DEVTMPFS=y
313CONFIG_DEVTMPFS_MOUNT=y 307CONFIG_DEVTMPFS_MOUNT=y
314CONFIG_TEST_ASYNC_DRIVER_PROBE=m 308CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -436,6 +430,8 @@ CONFIG_FB_AMIGA_OCS=y
436CONFIG_FB_AMIGA_ECS=y 430CONFIG_FB_AMIGA_ECS=y
437CONFIG_FB_AMIGA_AGA=y 431CONFIG_FB_AMIGA_AGA=y
438CONFIG_FB_FM2=y 432CONFIG_FB_FM2=y
433# CONFIG_LCD_CLASS_DEVICE is not set
434# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
439CONFIG_FRAMEBUFFER_CONSOLE=y 435CONFIG_FRAMEBUFFER_CONSOLE=y
440CONFIG_LOGO=y 436CONFIG_LOGO=y
441CONFIG_SOUND=m 437CONFIG_SOUND=m
@@ -553,13 +549,14 @@ CONFIG_NLS_MAC_TURKISH=m
553CONFIG_DLM=m 549CONFIG_DLM=m
554CONFIG_ENCRYPTED_KEYS=m 550CONFIG_ENCRYPTED_KEYS=m
555CONFIG_HARDENED_USERCOPY=y 551CONFIG_HARDENED_USERCOPY=y
556CONFIG_CRYPTO_RSA=m
557CONFIG_CRYPTO_DH=m
558CONFIG_CRYPTO_ECDH=m
559CONFIG_CRYPTO_MANAGER=y 552CONFIG_CRYPTO_MANAGER=y
560CONFIG_CRYPTO_USER=m 553CONFIG_CRYPTO_USER=m
561CONFIG_CRYPTO_CRYPTD=m 554CONFIG_CRYPTO_CRYPTD=m
562CONFIG_CRYPTO_TEST=m 555CONFIG_CRYPTO_TEST=m
556CONFIG_CRYPTO_RSA=m
557CONFIG_CRYPTO_DH=m
558CONFIG_CRYPTO_ECDH=m
559CONFIG_CRYPTO_ECRDSA=m
563CONFIG_CRYPTO_CHACHA20POLY1305=m 560CONFIG_CRYPTO_CHACHA20POLY1305=m
564CONFIG_CRYPTO_AEGIS128=m 561CONFIG_CRYPTO_AEGIS128=m
565CONFIG_CRYPTO_AEGIS128L=m 562CONFIG_CRYPTO_AEGIS128L=m
@@ -583,7 +580,6 @@ CONFIG_CRYPTO_RMD256=m
583CONFIG_CRYPTO_RMD320=m 580CONFIG_CRYPTO_RMD320=m
584CONFIG_CRYPTO_SHA3=m 581CONFIG_CRYPTO_SHA3=m
585CONFIG_CRYPTO_SM3=m 582CONFIG_CRYPTO_SM3=m
586CONFIG_CRYPTO_STREEBOG=m
587CONFIG_CRYPTO_TGR192=m 583CONFIG_CRYPTO_TGR192=m
588CONFIG_CRYPTO_WP512=m 584CONFIG_CRYPTO_WP512=m
589CONFIG_CRYPTO_AES_TI=m 585CONFIG_CRYPTO_AES_TI=m
@@ -626,6 +622,7 @@ CONFIG_ATOMIC64_SELFTEST=m
626CONFIG_ASYNC_RAID6_TEST=m 622CONFIG_ASYNC_RAID6_TEST=m
627CONFIG_TEST_HEXDUMP=m 623CONFIG_TEST_HEXDUMP=m
628CONFIG_TEST_STRING_HELPERS=m 624CONFIG_TEST_STRING_HELPERS=m
625CONFIG_TEST_STRSCPY=m
629CONFIG_TEST_KSTRTOX=m 626CONFIG_TEST_KSTRTOX=m
630CONFIG_TEST_PRINTF=m 627CONFIG_TEST_PRINTF=m
631CONFIG_TEST_BITMAP=m 628CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 2474d267460e..c6abbb535878 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -67,9 +67,6 @@ CONFIG_INET_AH=m
67CONFIG_INET_ESP=m 67CONFIG_INET_ESP=m
68CONFIG_INET_ESP_OFFLOAD=m 68CONFIG_INET_ESP_OFFLOAD=m
69CONFIG_INET_IPCOMP=m 69CONFIG_INET_IPCOMP=m
70CONFIG_INET_XFRM_MODE_TRANSPORT=m
71CONFIG_INET_XFRM_MODE_TUNNEL=m
72CONFIG_INET_XFRM_MODE_BEET=m
73CONFIG_INET_DIAG=m 70CONFIG_INET_DIAG=m
74CONFIG_INET_UDP_DIAG=m 71CONFIG_INET_UDP_DIAG=m
75CONFIG_INET_RAW_DIAG=m 72CONFIG_INET_RAW_DIAG=m
@@ -201,7 +198,6 @@ CONFIG_IP_SET_HASH_NETNET=m
201CONFIG_IP_SET_HASH_NETPORT=m 198CONFIG_IP_SET_HASH_NETPORT=m
202CONFIG_IP_SET_HASH_NETIFACE=m 199CONFIG_IP_SET_HASH_NETIFACE=m
203CONFIG_IP_SET_LIST_SET=m 200CONFIG_IP_SET_LIST_SET=m
204CONFIG_NFT_CHAIN_ROUTE_IPV4=m
205CONFIG_NFT_DUP_IPV4=m 201CONFIG_NFT_DUP_IPV4=m
206CONFIG_NFT_FIB_IPV4=m 202CONFIG_NFT_FIB_IPV4=m
207CONFIG_NF_TABLES_ARP=y 203CONFIG_NF_TABLES_ARP=y
@@ -227,7 +223,6 @@ CONFIG_IP_NF_RAW=m
227CONFIG_IP_NF_ARPTABLES=m 223CONFIG_IP_NF_ARPTABLES=m
228CONFIG_IP_NF_ARPFILTER=m 224CONFIG_IP_NF_ARPFILTER=m
229CONFIG_IP_NF_ARP_MANGLE=m 225CONFIG_IP_NF_ARP_MANGLE=m
230CONFIG_NFT_CHAIN_ROUTE_IPV6=m
231CONFIG_NFT_DUP_IPV6=m 226CONFIG_NFT_DUP_IPV6=m
232CONFIG_NFT_FIB_IPV6=m 227CONFIG_NFT_FIB_IPV6=m
233CONFIG_NF_FLOW_TABLE_IPV6=m 228CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -304,7 +299,6 @@ CONFIG_AF_KCM=m
304# CONFIG_WIRELESS is not set 299# CONFIG_WIRELESS is not set
305CONFIG_PSAMPLE=m 300CONFIG_PSAMPLE=m
306CONFIG_NET_IFE=m 301CONFIG_NET_IFE=m
307# CONFIG_UEVENT_HELPER is not set
308CONFIG_DEVTMPFS=y 302CONFIG_DEVTMPFS=y
309CONFIG_DEVTMPFS_MOUNT=y 303CONFIG_DEVTMPFS_MOUNT=y
310CONFIG_TEST_ASYNC_DRIVER_PROBE=m 304CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -397,6 +391,8 @@ CONFIG_PPS_CLIENT_LDISC=m
397CONFIG_PTP_1588_CLOCK=m 391CONFIG_PTP_1588_CLOCK=m
398# CONFIG_HWMON is not set 392# CONFIG_HWMON is not set
399CONFIG_FB=y 393CONFIG_FB=y
394# CONFIG_LCD_CLASS_DEVICE is not set
395# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
400CONFIG_FRAMEBUFFER_CONSOLE=y 396CONFIG_FRAMEBUFFER_CONSOLE=y
401CONFIG_LOGO=y 397CONFIG_LOGO=y
402# CONFIG_LOGO_LINUX_VGA16 is not set 398# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -513,13 +509,14 @@ CONFIG_NLS_MAC_TURKISH=m
513CONFIG_DLM=m 509CONFIG_DLM=m
514CONFIG_ENCRYPTED_KEYS=m 510CONFIG_ENCRYPTED_KEYS=m
515CONFIG_HARDENED_USERCOPY=y 511CONFIG_HARDENED_USERCOPY=y
516CONFIG_CRYPTO_RSA=m
517CONFIG_CRYPTO_DH=m
518CONFIG_CRYPTO_ECDH=m
519CONFIG_CRYPTO_MANAGER=y 512CONFIG_CRYPTO_MANAGER=y
520CONFIG_CRYPTO_USER=m 513CONFIG_CRYPTO_USER=m
521CONFIG_CRYPTO_CRYPTD=m 514CONFIG_CRYPTO_CRYPTD=m
522CONFIG_CRYPTO_TEST=m 515CONFIG_CRYPTO_TEST=m
516CONFIG_CRYPTO_RSA=m
517CONFIG_CRYPTO_DH=m
518CONFIG_CRYPTO_ECDH=m
519CONFIG_CRYPTO_ECRDSA=m
523CONFIG_CRYPTO_CHACHA20POLY1305=m 520CONFIG_CRYPTO_CHACHA20POLY1305=m
524CONFIG_CRYPTO_AEGIS128=m 521CONFIG_CRYPTO_AEGIS128=m
525CONFIG_CRYPTO_AEGIS128L=m 522CONFIG_CRYPTO_AEGIS128L=m
@@ -543,7 +540,6 @@ CONFIG_CRYPTO_RMD256=m
543CONFIG_CRYPTO_RMD320=m 540CONFIG_CRYPTO_RMD320=m
544CONFIG_CRYPTO_SHA3=m 541CONFIG_CRYPTO_SHA3=m
545CONFIG_CRYPTO_SM3=m 542CONFIG_CRYPTO_SM3=m
546CONFIG_CRYPTO_STREEBOG=m
547CONFIG_CRYPTO_TGR192=m 543CONFIG_CRYPTO_TGR192=m
548CONFIG_CRYPTO_WP512=m 544CONFIG_CRYPTO_WP512=m
549CONFIG_CRYPTO_AES_TI=m 545CONFIG_CRYPTO_AES_TI=m
@@ -586,6 +582,7 @@ CONFIG_ATOMIC64_SELFTEST=m
586CONFIG_ASYNC_RAID6_TEST=m 582CONFIG_ASYNC_RAID6_TEST=m
587CONFIG_TEST_HEXDUMP=m 583CONFIG_TEST_HEXDUMP=m
588CONFIG_TEST_STRING_HELPERS=m 584CONFIG_TEST_STRING_HELPERS=m
585CONFIG_TEST_STRSCPY=m
589CONFIG_TEST_KSTRTOX=m 586CONFIG_TEST_KSTRTOX=m
590CONFIG_TEST_PRINTF=m 587CONFIG_TEST_PRINTF=m
591CONFIG_TEST_BITMAP=m 588CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 0fc7d2992fe0..06ae65bad177 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -74,9 +74,6 @@ CONFIG_INET_AH=m
74CONFIG_INET_ESP=m 74CONFIG_INET_ESP=m
75CONFIG_INET_ESP_OFFLOAD=m 75CONFIG_INET_ESP_OFFLOAD=m
76CONFIG_INET_IPCOMP=m 76CONFIG_INET_IPCOMP=m
77CONFIG_INET_XFRM_MODE_TRANSPORT=m
78CONFIG_INET_XFRM_MODE_TUNNEL=m
79CONFIG_INET_XFRM_MODE_BEET=m
80CONFIG_INET_DIAG=m 77CONFIG_INET_DIAG=m
81CONFIG_INET_UDP_DIAG=m 78CONFIG_INET_UDP_DIAG=m
82CONFIG_INET_RAW_DIAG=m 79CONFIG_INET_RAW_DIAG=m
@@ -208,7 +205,6 @@ CONFIG_IP_SET_HASH_NETNET=m
208CONFIG_IP_SET_HASH_NETPORT=m 205CONFIG_IP_SET_HASH_NETPORT=m
209CONFIG_IP_SET_HASH_NETIFACE=m 206CONFIG_IP_SET_HASH_NETIFACE=m
210CONFIG_IP_SET_LIST_SET=m 207CONFIG_IP_SET_LIST_SET=m
211CONFIG_NFT_CHAIN_ROUTE_IPV4=m
212CONFIG_NFT_DUP_IPV4=m 208CONFIG_NFT_DUP_IPV4=m
213CONFIG_NFT_FIB_IPV4=m 209CONFIG_NFT_FIB_IPV4=m
214CONFIG_NF_TABLES_ARP=y 210CONFIG_NF_TABLES_ARP=y
@@ -234,7 +230,6 @@ CONFIG_IP_NF_RAW=m
234CONFIG_IP_NF_ARPTABLES=m 230CONFIG_IP_NF_ARPTABLES=m
235CONFIG_IP_NF_ARPFILTER=m 231CONFIG_IP_NF_ARPFILTER=m
236CONFIG_IP_NF_ARP_MANGLE=m 232CONFIG_IP_NF_ARP_MANGLE=m
237CONFIG_NFT_CHAIN_ROUTE_IPV6=m
238CONFIG_NFT_DUP_IPV6=m 233CONFIG_NFT_DUP_IPV6=m
239CONFIG_NFT_FIB_IPV6=m 234CONFIG_NFT_FIB_IPV6=m
240CONFIG_NF_FLOW_TABLE_IPV6=m 235CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -311,7 +306,6 @@ CONFIG_AF_KCM=m
311# CONFIG_WIRELESS is not set 306# CONFIG_WIRELESS is not set
312CONFIG_PSAMPLE=m 307CONFIG_PSAMPLE=m
313CONFIG_NET_IFE=m 308CONFIG_NET_IFE=m
314# CONFIG_UEVENT_HELPER is not set
315CONFIG_DEVTMPFS=y 309CONFIG_DEVTMPFS=y
316CONFIG_DEVTMPFS_MOUNT=y 310CONFIG_DEVTMPFS_MOUNT=y
317CONFIG_TEST_ASYNC_DRIVER_PROBE=m 311CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -421,6 +415,8 @@ CONFIG_PTP_1588_CLOCK=m
421# CONFIG_HWMON is not set 415# CONFIG_HWMON is not set
422CONFIG_FB=y 416CONFIG_FB=y
423CONFIG_FB_ATARI=y 417CONFIG_FB_ATARI=y
418# CONFIG_LCD_CLASS_DEVICE is not set
419# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
424CONFIG_FRAMEBUFFER_CONSOLE=y 420CONFIG_FRAMEBUFFER_CONSOLE=y
425CONFIG_LOGO=y 421CONFIG_LOGO=y
426CONFIG_SOUND=m 422CONFIG_SOUND=m
@@ -535,13 +531,14 @@ CONFIG_NLS_MAC_TURKISH=m
535CONFIG_DLM=m 531CONFIG_DLM=m
536CONFIG_ENCRYPTED_KEYS=m 532CONFIG_ENCRYPTED_KEYS=m
537CONFIG_HARDENED_USERCOPY=y 533CONFIG_HARDENED_USERCOPY=y
538CONFIG_CRYPTO_RSA=m
539CONFIG_CRYPTO_DH=m
540CONFIG_CRYPTO_ECDH=m
541CONFIG_CRYPTO_MANAGER=y 534CONFIG_CRYPTO_MANAGER=y
542CONFIG_CRYPTO_USER=m 535CONFIG_CRYPTO_USER=m
543CONFIG_CRYPTO_CRYPTD=m 536CONFIG_CRYPTO_CRYPTD=m
544CONFIG_CRYPTO_TEST=m 537CONFIG_CRYPTO_TEST=m
538CONFIG_CRYPTO_RSA=m
539CONFIG_CRYPTO_DH=m
540CONFIG_CRYPTO_ECDH=m
541CONFIG_CRYPTO_ECRDSA=m
545CONFIG_CRYPTO_CHACHA20POLY1305=m 542CONFIG_CRYPTO_CHACHA20POLY1305=m
546CONFIG_CRYPTO_AEGIS128=m 543CONFIG_CRYPTO_AEGIS128=m
547CONFIG_CRYPTO_AEGIS128L=m 544CONFIG_CRYPTO_AEGIS128L=m
@@ -565,7 +562,6 @@ CONFIG_CRYPTO_RMD256=m
565CONFIG_CRYPTO_RMD320=m 562CONFIG_CRYPTO_RMD320=m
566CONFIG_CRYPTO_SHA3=m 563CONFIG_CRYPTO_SHA3=m
567CONFIG_CRYPTO_SM3=m 564CONFIG_CRYPTO_SM3=m
568CONFIG_CRYPTO_STREEBOG=m
569CONFIG_CRYPTO_TGR192=m 565CONFIG_CRYPTO_TGR192=m
570CONFIG_CRYPTO_WP512=m 566CONFIG_CRYPTO_WP512=m
571CONFIG_CRYPTO_AES_TI=m 567CONFIG_CRYPTO_AES_TI=m
@@ -608,6 +604,7 @@ CONFIG_ATOMIC64_SELFTEST=m
608CONFIG_ASYNC_RAID6_TEST=m 604CONFIG_ASYNC_RAID6_TEST=m
609CONFIG_TEST_HEXDUMP=m 605CONFIG_TEST_HEXDUMP=m
610CONFIG_TEST_STRING_HELPERS=m 606CONFIG_TEST_STRING_HELPERS=m
607CONFIG_TEST_STRSCPY=m
611CONFIG_TEST_KSTRTOX=m 608CONFIG_TEST_KSTRTOX=m
612CONFIG_TEST_PRINTF=m 609CONFIG_TEST_PRINTF=m
613CONFIG_TEST_BITMAP=m 610CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 699df9fdf866..5616b94053b6 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -64,9 +64,6 @@ CONFIG_INET_AH=m
64CONFIG_INET_ESP=m 64CONFIG_INET_ESP=m
65CONFIG_INET_ESP_OFFLOAD=m 65CONFIG_INET_ESP_OFFLOAD=m
66CONFIG_INET_IPCOMP=m 66CONFIG_INET_IPCOMP=m
67CONFIG_INET_XFRM_MODE_TRANSPORT=m
68CONFIG_INET_XFRM_MODE_TUNNEL=m
69CONFIG_INET_XFRM_MODE_BEET=m
70CONFIG_INET_DIAG=m 67CONFIG_INET_DIAG=m
71CONFIG_INET_UDP_DIAG=m 68CONFIG_INET_UDP_DIAG=m
72CONFIG_INET_RAW_DIAG=m 69CONFIG_INET_RAW_DIAG=m
@@ -198,7 +195,6 @@ CONFIG_IP_SET_HASH_NETNET=m
198CONFIG_IP_SET_HASH_NETPORT=m 195CONFIG_IP_SET_HASH_NETPORT=m
199CONFIG_IP_SET_HASH_NETIFACE=m 196CONFIG_IP_SET_HASH_NETIFACE=m
200CONFIG_IP_SET_LIST_SET=m 197CONFIG_IP_SET_LIST_SET=m
201CONFIG_NFT_CHAIN_ROUTE_IPV4=m
202CONFIG_NFT_DUP_IPV4=m 198CONFIG_NFT_DUP_IPV4=m
203CONFIG_NFT_FIB_IPV4=m 199CONFIG_NFT_FIB_IPV4=m
204CONFIG_NF_TABLES_ARP=y 200CONFIG_NF_TABLES_ARP=y
@@ -224,7 +220,6 @@ CONFIG_IP_NF_RAW=m
224CONFIG_IP_NF_ARPTABLES=m 220CONFIG_IP_NF_ARPTABLES=m
225CONFIG_IP_NF_ARPFILTER=m 221CONFIG_IP_NF_ARPFILTER=m
226CONFIG_IP_NF_ARP_MANGLE=m 222CONFIG_IP_NF_ARP_MANGLE=m
227CONFIG_NFT_CHAIN_ROUTE_IPV6=m
228CONFIG_NFT_DUP_IPV6=m 223CONFIG_NFT_DUP_IPV6=m
229CONFIG_NFT_FIB_IPV6=m 224CONFIG_NFT_FIB_IPV6=m
230CONFIG_NF_FLOW_TABLE_IPV6=m 225CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -301,7 +296,6 @@ CONFIG_AF_KCM=m
301# CONFIG_WIRELESS is not set 296# CONFIG_WIRELESS is not set
302CONFIG_PSAMPLE=m 297CONFIG_PSAMPLE=m
303CONFIG_NET_IFE=m 298CONFIG_NET_IFE=m
304# CONFIG_UEVENT_HELPER is not set
305CONFIG_DEVTMPFS=y 299CONFIG_DEVTMPFS=y
306CONFIG_DEVTMPFS_MOUNT=y 300CONFIG_DEVTMPFS_MOUNT=y
307CONFIG_TEST_ASYNC_DRIVER_PROBE=m 301CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -394,6 +388,8 @@ CONFIG_NTP_PPS=y
394CONFIG_PPS_CLIENT_LDISC=m 388CONFIG_PPS_CLIENT_LDISC=m
395CONFIG_PTP_1588_CLOCK=m 389CONFIG_PTP_1588_CLOCK=m
396# CONFIG_HWMON is not set 390# CONFIG_HWMON is not set
391# CONFIG_LCD_CLASS_DEVICE is not set
392# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
397CONFIG_HID=m 393CONFIG_HID=m
398CONFIG_HIDRAW=y 394CONFIG_HIDRAW=y
399CONFIG_UHID=m 395CONFIG_UHID=m
@@ -506,13 +502,14 @@ CONFIG_NLS_MAC_TURKISH=m
506CONFIG_DLM=m 502CONFIG_DLM=m
507CONFIG_ENCRYPTED_KEYS=m 503CONFIG_ENCRYPTED_KEYS=m
508CONFIG_HARDENED_USERCOPY=y 504CONFIG_HARDENED_USERCOPY=y
509CONFIG_CRYPTO_RSA=m
510CONFIG_CRYPTO_DH=m
511CONFIG_CRYPTO_ECDH=m
512CONFIG_CRYPTO_MANAGER=y 505CONFIG_CRYPTO_MANAGER=y
513CONFIG_CRYPTO_USER=m 506CONFIG_CRYPTO_USER=m
514CONFIG_CRYPTO_CRYPTD=m 507CONFIG_CRYPTO_CRYPTD=m
515CONFIG_CRYPTO_TEST=m 508CONFIG_CRYPTO_TEST=m
509CONFIG_CRYPTO_RSA=m
510CONFIG_CRYPTO_DH=m
511CONFIG_CRYPTO_ECDH=m
512CONFIG_CRYPTO_ECRDSA=m
516CONFIG_CRYPTO_CHACHA20POLY1305=m 513CONFIG_CRYPTO_CHACHA20POLY1305=m
517CONFIG_CRYPTO_AEGIS128=m 514CONFIG_CRYPTO_AEGIS128=m
518CONFIG_CRYPTO_AEGIS128L=m 515CONFIG_CRYPTO_AEGIS128L=m
@@ -536,7 +533,6 @@ CONFIG_CRYPTO_RMD256=m
536CONFIG_CRYPTO_RMD320=m 533CONFIG_CRYPTO_RMD320=m
537CONFIG_CRYPTO_SHA3=m 534CONFIG_CRYPTO_SHA3=m
538CONFIG_CRYPTO_SM3=m 535CONFIG_CRYPTO_SM3=m
539CONFIG_CRYPTO_STREEBOG=m
540CONFIG_CRYPTO_TGR192=m 536CONFIG_CRYPTO_TGR192=m
541CONFIG_CRYPTO_WP512=m 537CONFIG_CRYPTO_WP512=m
542CONFIG_CRYPTO_AES_TI=m 538CONFIG_CRYPTO_AES_TI=m
@@ -579,6 +575,7 @@ CONFIG_ATOMIC64_SELFTEST=m
579CONFIG_ASYNC_RAID6_TEST=m 575CONFIG_ASYNC_RAID6_TEST=m
580CONFIG_TEST_HEXDUMP=m 576CONFIG_TEST_HEXDUMP=m
581CONFIG_TEST_STRING_HELPERS=m 577CONFIG_TEST_STRING_HELPERS=m
578CONFIG_TEST_STRSCPY=m
582CONFIG_TEST_KSTRTOX=m 579CONFIG_TEST_KSTRTOX=m
583CONFIG_TEST_PRINTF=m 580CONFIG_TEST_PRINTF=m
584CONFIG_TEST_BITMAP=m 581CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index b50802255324..1106521f3b56 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -66,9 +66,6 @@ CONFIG_INET_AH=m
66CONFIG_INET_ESP=m 66CONFIG_INET_ESP=m
67CONFIG_INET_ESP_OFFLOAD=m 67CONFIG_INET_ESP_OFFLOAD=m
68CONFIG_INET_IPCOMP=m 68CONFIG_INET_IPCOMP=m
69CONFIG_INET_XFRM_MODE_TRANSPORT=m
70CONFIG_INET_XFRM_MODE_TUNNEL=m
71CONFIG_INET_XFRM_MODE_BEET=m
72CONFIG_INET_DIAG=m 69CONFIG_INET_DIAG=m
73CONFIG_INET_UDP_DIAG=m 70CONFIG_INET_UDP_DIAG=m
74CONFIG_INET_RAW_DIAG=m 71CONFIG_INET_RAW_DIAG=m
@@ -200,7 +197,6 @@ CONFIG_IP_SET_HASH_NETNET=m
200CONFIG_IP_SET_HASH_NETPORT=m 197CONFIG_IP_SET_HASH_NETPORT=m
201CONFIG_IP_SET_HASH_NETIFACE=m 198CONFIG_IP_SET_HASH_NETIFACE=m
202CONFIG_IP_SET_LIST_SET=m 199CONFIG_IP_SET_LIST_SET=m
203CONFIG_NFT_CHAIN_ROUTE_IPV4=m
204CONFIG_NFT_DUP_IPV4=m 200CONFIG_NFT_DUP_IPV4=m
205CONFIG_NFT_FIB_IPV4=m 201CONFIG_NFT_FIB_IPV4=m
206CONFIG_NF_TABLES_ARP=y 202CONFIG_NF_TABLES_ARP=y
@@ -226,7 +222,6 @@ CONFIG_IP_NF_RAW=m
226CONFIG_IP_NF_ARPTABLES=m 222CONFIG_IP_NF_ARPTABLES=m
227CONFIG_IP_NF_ARPFILTER=m 223CONFIG_IP_NF_ARPFILTER=m
228CONFIG_IP_NF_ARP_MANGLE=m 224CONFIG_IP_NF_ARP_MANGLE=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 225CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 226CONFIG_NFT_FIB_IPV6=m
232CONFIG_NF_FLOW_TABLE_IPV6=m 227CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -303,7 +298,6 @@ CONFIG_AF_KCM=m
303# CONFIG_WIRELESS is not set 298# CONFIG_WIRELESS is not set
304CONFIG_PSAMPLE=m 299CONFIG_PSAMPLE=m
305CONFIG_NET_IFE=m 300CONFIG_NET_IFE=m
306# CONFIG_UEVENT_HELPER is not set
307CONFIG_DEVTMPFS=y 301CONFIG_DEVTMPFS=y
308CONFIG_DEVTMPFS_MOUNT=y 302CONFIG_DEVTMPFS_MOUNT=y
309CONFIG_TEST_ASYNC_DRIVER_PROBE=m 303CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -399,6 +393,8 @@ CONFIG_PPS_CLIENT_LDISC=m
399CONFIG_PTP_1588_CLOCK=m 393CONFIG_PTP_1588_CLOCK=m
400# CONFIG_HWMON is not set 394# CONFIG_HWMON is not set
401CONFIG_FB=y 395CONFIG_FB=y
396# CONFIG_LCD_CLASS_DEVICE is not set
397# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
402CONFIG_FRAMEBUFFER_CONSOLE=y 398CONFIG_FRAMEBUFFER_CONSOLE=y
403CONFIG_LOGO=y 399CONFIG_LOGO=y
404# CONFIG_LOGO_LINUX_MONO is not set 400# CONFIG_LOGO_LINUX_MONO is not set
@@ -515,13 +511,14 @@ CONFIG_NLS_MAC_TURKISH=m
515CONFIG_DLM=m 511CONFIG_DLM=m
516CONFIG_ENCRYPTED_KEYS=m 512CONFIG_ENCRYPTED_KEYS=m
517CONFIG_HARDENED_USERCOPY=y 513CONFIG_HARDENED_USERCOPY=y
518CONFIG_CRYPTO_RSA=m
519CONFIG_CRYPTO_DH=m
520CONFIG_CRYPTO_ECDH=m
521CONFIG_CRYPTO_MANAGER=y 514CONFIG_CRYPTO_MANAGER=y
522CONFIG_CRYPTO_USER=m 515CONFIG_CRYPTO_USER=m
523CONFIG_CRYPTO_CRYPTD=m 516CONFIG_CRYPTO_CRYPTD=m
524CONFIG_CRYPTO_TEST=m 517CONFIG_CRYPTO_TEST=m
518CONFIG_CRYPTO_RSA=m
519CONFIG_CRYPTO_DH=m
520CONFIG_CRYPTO_ECDH=m
521CONFIG_CRYPTO_ECRDSA=m
525CONFIG_CRYPTO_CHACHA20POLY1305=m 522CONFIG_CRYPTO_CHACHA20POLY1305=m
526CONFIG_CRYPTO_AEGIS128=m 523CONFIG_CRYPTO_AEGIS128=m
527CONFIG_CRYPTO_AEGIS128L=m 524CONFIG_CRYPTO_AEGIS128L=m
@@ -545,7 +542,6 @@ CONFIG_CRYPTO_RMD256=m
545CONFIG_CRYPTO_RMD320=m 542CONFIG_CRYPTO_RMD320=m
546CONFIG_CRYPTO_SHA3=m 543CONFIG_CRYPTO_SHA3=m
547CONFIG_CRYPTO_SM3=m 544CONFIG_CRYPTO_SM3=m
548CONFIG_CRYPTO_STREEBOG=m
549CONFIG_CRYPTO_TGR192=m 545CONFIG_CRYPTO_TGR192=m
550CONFIG_CRYPTO_WP512=m 546CONFIG_CRYPTO_WP512=m
551CONFIG_CRYPTO_AES_TI=m 547CONFIG_CRYPTO_AES_TI=m
@@ -588,6 +584,7 @@ CONFIG_ATOMIC64_SELFTEST=m
588CONFIG_ASYNC_RAID6_TEST=m 584CONFIG_ASYNC_RAID6_TEST=m
589CONFIG_TEST_HEXDUMP=m 585CONFIG_TEST_HEXDUMP=m
590CONFIG_TEST_STRING_HELPERS=m 586CONFIG_TEST_STRING_HELPERS=m
587CONFIG_TEST_STRSCPY=m
591CONFIG_TEST_KSTRTOX=m 588CONFIG_TEST_KSTRTOX=m
592CONFIG_TEST_PRINTF=m 589CONFIG_TEST_PRINTF=m
593CONFIG_TEST_BITMAP=m 590CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 04e7d70f6030..226c6c063cd4 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -65,9 +65,6 @@ CONFIG_INET_AH=m
65CONFIG_INET_ESP=m 65CONFIG_INET_ESP=m
66CONFIG_INET_ESP_OFFLOAD=m 66CONFIG_INET_ESP_OFFLOAD=m
67CONFIG_INET_IPCOMP=m 67CONFIG_INET_IPCOMP=m
68CONFIG_INET_XFRM_MODE_TRANSPORT=m
69CONFIG_INET_XFRM_MODE_TUNNEL=m
70CONFIG_INET_XFRM_MODE_BEET=m
71CONFIG_INET_DIAG=m 68CONFIG_INET_DIAG=m
72CONFIG_INET_UDP_DIAG=m 69CONFIG_INET_UDP_DIAG=m
73CONFIG_INET_RAW_DIAG=m 70CONFIG_INET_RAW_DIAG=m
@@ -199,7 +196,6 @@ CONFIG_IP_SET_HASH_NETNET=m
199CONFIG_IP_SET_HASH_NETPORT=m 196CONFIG_IP_SET_HASH_NETPORT=m
200CONFIG_IP_SET_HASH_NETIFACE=m 197CONFIG_IP_SET_HASH_NETIFACE=m
201CONFIG_IP_SET_LIST_SET=m 198CONFIG_IP_SET_LIST_SET=m
202CONFIG_NFT_CHAIN_ROUTE_IPV4=m
203CONFIG_NFT_DUP_IPV4=m 199CONFIG_NFT_DUP_IPV4=m
204CONFIG_NFT_FIB_IPV4=m 200CONFIG_NFT_FIB_IPV4=m
205CONFIG_NF_TABLES_ARP=y 201CONFIG_NF_TABLES_ARP=y
@@ -225,7 +221,6 @@ CONFIG_IP_NF_RAW=m
225CONFIG_IP_NF_ARPTABLES=m 221CONFIG_IP_NF_ARPTABLES=m
226CONFIG_IP_NF_ARPFILTER=m 222CONFIG_IP_NF_ARPFILTER=m
227CONFIG_IP_NF_ARP_MANGLE=m 223CONFIG_IP_NF_ARP_MANGLE=m
228CONFIG_NFT_CHAIN_ROUTE_IPV6=m
229CONFIG_NFT_DUP_IPV6=m 224CONFIG_NFT_DUP_IPV6=m
230CONFIG_NFT_FIB_IPV6=m 225CONFIG_NFT_FIB_IPV6=m
231CONFIG_NF_FLOW_TABLE_IPV6=m 226CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -305,7 +300,6 @@ CONFIG_AF_KCM=m
305# CONFIG_WIRELESS is not set 300# CONFIG_WIRELESS is not set
306CONFIG_PSAMPLE=m 301CONFIG_PSAMPLE=m
307CONFIG_NET_IFE=m 302CONFIG_NET_IFE=m
308# CONFIG_UEVENT_HELPER is not set
309CONFIG_DEVTMPFS=y 303CONFIG_DEVTMPFS=y
310CONFIG_DEVTMPFS_MOUNT=y 304CONFIG_DEVTMPFS_MOUNT=y
311CONFIG_TEST_ASYNC_DRIVER_PROBE=m 305CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -423,6 +417,8 @@ CONFIG_PTP_1588_CLOCK=m
423CONFIG_FB=y 417CONFIG_FB=y
424CONFIG_FB_VALKYRIE=y 418CONFIG_FB_VALKYRIE=y
425CONFIG_FB_MAC=y 419CONFIG_FB_MAC=y
420# CONFIG_LCD_CLASS_DEVICE is not set
421# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
426CONFIG_FRAMEBUFFER_CONSOLE=y 422CONFIG_FRAMEBUFFER_CONSOLE=y
427CONFIG_LOGO=y 423CONFIG_LOGO=y
428CONFIG_HID=m 424CONFIG_HID=m
@@ -537,13 +533,14 @@ CONFIG_NLS_MAC_TURKISH=m
537CONFIG_DLM=m 533CONFIG_DLM=m
538CONFIG_ENCRYPTED_KEYS=m 534CONFIG_ENCRYPTED_KEYS=m
539CONFIG_HARDENED_USERCOPY=y 535CONFIG_HARDENED_USERCOPY=y
540CONFIG_CRYPTO_RSA=m
541CONFIG_CRYPTO_DH=m
542CONFIG_CRYPTO_ECDH=m
543CONFIG_CRYPTO_MANAGER=y 536CONFIG_CRYPTO_MANAGER=y
544CONFIG_CRYPTO_USER=m 537CONFIG_CRYPTO_USER=m
545CONFIG_CRYPTO_CRYPTD=m 538CONFIG_CRYPTO_CRYPTD=m
546CONFIG_CRYPTO_TEST=m 539CONFIG_CRYPTO_TEST=m
540CONFIG_CRYPTO_RSA=m
541CONFIG_CRYPTO_DH=m
542CONFIG_CRYPTO_ECDH=m
543CONFIG_CRYPTO_ECRDSA=m
547CONFIG_CRYPTO_CHACHA20POLY1305=m 544CONFIG_CRYPTO_CHACHA20POLY1305=m
548CONFIG_CRYPTO_AEGIS128=m 545CONFIG_CRYPTO_AEGIS128=m
549CONFIG_CRYPTO_AEGIS128L=m 546CONFIG_CRYPTO_AEGIS128L=m
@@ -567,7 +564,6 @@ CONFIG_CRYPTO_RMD256=m
567CONFIG_CRYPTO_RMD320=m 564CONFIG_CRYPTO_RMD320=m
568CONFIG_CRYPTO_SHA3=m 565CONFIG_CRYPTO_SHA3=m
569CONFIG_CRYPTO_SM3=m 566CONFIG_CRYPTO_SM3=m
570CONFIG_CRYPTO_STREEBOG=m
571CONFIG_CRYPTO_TGR192=m 567CONFIG_CRYPTO_TGR192=m
572CONFIG_CRYPTO_WP512=m 568CONFIG_CRYPTO_WP512=m
573CONFIG_CRYPTO_AES_TI=m 569CONFIG_CRYPTO_AES_TI=m
@@ -610,6 +606,7 @@ CONFIG_ATOMIC64_SELFTEST=m
610CONFIG_ASYNC_RAID6_TEST=m 606CONFIG_ASYNC_RAID6_TEST=m
611CONFIG_TEST_HEXDUMP=m 607CONFIG_TEST_HEXDUMP=m
612CONFIG_TEST_STRING_HELPERS=m 608CONFIG_TEST_STRING_HELPERS=m
609CONFIG_TEST_STRSCPY=m
613CONFIG_TEST_KSTRTOX=m 610CONFIG_TEST_KSTRTOX=m
614CONFIG_TEST_PRINTF=m 611CONFIG_TEST_PRINTF=m
615CONFIG_TEST_BITMAP=m 612CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 5e1cc4c17852..39f603417928 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -85,9 +85,6 @@ CONFIG_INET_AH=m
85CONFIG_INET_ESP=m 85CONFIG_INET_ESP=m
86CONFIG_INET_ESP_OFFLOAD=m 86CONFIG_INET_ESP_OFFLOAD=m
87CONFIG_INET_IPCOMP=m 87CONFIG_INET_IPCOMP=m
88CONFIG_INET_XFRM_MODE_TRANSPORT=m
89CONFIG_INET_XFRM_MODE_TUNNEL=m
90CONFIG_INET_XFRM_MODE_BEET=m
91CONFIG_INET_DIAG=m 88CONFIG_INET_DIAG=m
92CONFIG_INET_UDP_DIAG=m 89CONFIG_INET_UDP_DIAG=m
93CONFIG_INET_RAW_DIAG=m 90CONFIG_INET_RAW_DIAG=m
@@ -219,7 +216,6 @@ CONFIG_IP_SET_HASH_NETNET=m
219CONFIG_IP_SET_HASH_NETPORT=m 216CONFIG_IP_SET_HASH_NETPORT=m
220CONFIG_IP_SET_HASH_NETIFACE=m 217CONFIG_IP_SET_HASH_NETIFACE=m
221CONFIG_IP_SET_LIST_SET=m 218CONFIG_IP_SET_LIST_SET=m
222CONFIG_NFT_CHAIN_ROUTE_IPV4=m
223CONFIG_NFT_DUP_IPV4=m 219CONFIG_NFT_DUP_IPV4=m
224CONFIG_NFT_FIB_IPV4=m 220CONFIG_NFT_FIB_IPV4=m
225CONFIG_NF_TABLES_ARP=y 221CONFIG_NF_TABLES_ARP=y
@@ -245,7 +241,6 @@ CONFIG_IP_NF_RAW=m
245CONFIG_IP_NF_ARPTABLES=m 241CONFIG_IP_NF_ARPTABLES=m
246CONFIG_IP_NF_ARPFILTER=m 242CONFIG_IP_NF_ARPFILTER=m
247CONFIG_IP_NF_ARP_MANGLE=m 243CONFIG_IP_NF_ARP_MANGLE=m
248CONFIG_NFT_CHAIN_ROUTE_IPV6=m
249CONFIG_NFT_DUP_IPV6=m 244CONFIG_NFT_DUP_IPV6=m
250CONFIG_NFT_FIB_IPV6=m 245CONFIG_NFT_FIB_IPV6=m
251CONFIG_NF_FLOW_TABLE_IPV6=m 246CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -325,7 +320,6 @@ CONFIG_AF_KCM=m
325# CONFIG_WIRELESS is not set 320# CONFIG_WIRELESS is not set
326CONFIG_PSAMPLE=m 321CONFIG_PSAMPLE=m
327CONFIG_NET_IFE=m 322CONFIG_NET_IFE=m
328# CONFIG_UEVENT_HELPER is not set
329CONFIG_DEVTMPFS=y 323CONFIG_DEVTMPFS=y
330CONFIG_DEVTMPFS_MOUNT=y 324CONFIG_DEVTMPFS_MOUNT=y
331CONFIG_TEST_ASYNC_DRIVER_PROBE=m 325CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -499,6 +493,8 @@ CONFIG_FB_FM2=y
499CONFIG_FB_ATARI=y 493CONFIG_FB_ATARI=y
500CONFIG_FB_VALKYRIE=y 494CONFIG_FB_VALKYRIE=y
501CONFIG_FB_MAC=y 495CONFIG_FB_MAC=y
496# CONFIG_LCD_CLASS_DEVICE is not set
497# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
502CONFIG_FRAMEBUFFER_CONSOLE=y 498CONFIG_FRAMEBUFFER_CONSOLE=y
503CONFIG_LOGO=y 499CONFIG_LOGO=y
504CONFIG_SOUND=m 500CONFIG_SOUND=m
@@ -619,13 +615,14 @@ CONFIG_NLS_MAC_TURKISH=m
619CONFIG_DLM=m 615CONFIG_DLM=m
620CONFIG_ENCRYPTED_KEYS=m 616CONFIG_ENCRYPTED_KEYS=m
621CONFIG_HARDENED_USERCOPY=y 617CONFIG_HARDENED_USERCOPY=y
622CONFIG_CRYPTO_RSA=m
623CONFIG_CRYPTO_DH=m
624CONFIG_CRYPTO_ECDH=m
625CONFIG_CRYPTO_MANAGER=y 618CONFIG_CRYPTO_MANAGER=y
626CONFIG_CRYPTO_USER=m 619CONFIG_CRYPTO_USER=m
627CONFIG_CRYPTO_CRYPTD=m 620CONFIG_CRYPTO_CRYPTD=m
628CONFIG_CRYPTO_TEST=m 621CONFIG_CRYPTO_TEST=m
622CONFIG_CRYPTO_RSA=m
623CONFIG_CRYPTO_DH=m
624CONFIG_CRYPTO_ECDH=m
625CONFIG_CRYPTO_ECRDSA=m
629CONFIG_CRYPTO_CHACHA20POLY1305=m 626CONFIG_CRYPTO_CHACHA20POLY1305=m
630CONFIG_CRYPTO_AEGIS128=m 627CONFIG_CRYPTO_AEGIS128=m
631CONFIG_CRYPTO_AEGIS128L=m 628CONFIG_CRYPTO_AEGIS128L=m
@@ -649,7 +646,6 @@ CONFIG_CRYPTO_RMD256=m
649CONFIG_CRYPTO_RMD320=m 646CONFIG_CRYPTO_RMD320=m
650CONFIG_CRYPTO_SHA3=m 647CONFIG_CRYPTO_SHA3=m
651CONFIG_CRYPTO_SM3=m 648CONFIG_CRYPTO_SM3=m
652CONFIG_CRYPTO_STREEBOG=m
653CONFIG_CRYPTO_TGR192=m 649CONFIG_CRYPTO_TGR192=m
654CONFIG_CRYPTO_WP512=m 650CONFIG_CRYPTO_WP512=m
655CONFIG_CRYPTO_AES_TI=m 651CONFIG_CRYPTO_AES_TI=m
@@ -692,6 +688,7 @@ CONFIG_ATOMIC64_SELFTEST=m
692CONFIG_ASYNC_RAID6_TEST=m 688CONFIG_ASYNC_RAID6_TEST=m
693CONFIG_TEST_HEXDUMP=m 689CONFIG_TEST_HEXDUMP=m
694CONFIG_TEST_STRING_HELPERS=m 690CONFIG_TEST_STRING_HELPERS=m
691CONFIG_TEST_STRSCPY=m
695CONFIG_TEST_KSTRTOX=m 692CONFIG_TEST_KSTRTOX=m
696CONFIG_TEST_PRINTF=m 693CONFIG_TEST_PRINTF=m
697CONFIG_TEST_BITMAP=m 694CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 170ac8792c2d..175a607f576c 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -63,9 +63,6 @@ CONFIG_INET_AH=m
63CONFIG_INET_ESP=m 63CONFIG_INET_ESP=m
64CONFIG_INET_ESP_OFFLOAD=m 64CONFIG_INET_ESP_OFFLOAD=m
65CONFIG_INET_IPCOMP=m 65CONFIG_INET_IPCOMP=m
66CONFIG_INET_XFRM_MODE_TRANSPORT=m
67CONFIG_INET_XFRM_MODE_TUNNEL=m
68CONFIG_INET_XFRM_MODE_BEET=m
69CONFIG_INET_DIAG=m 66CONFIG_INET_DIAG=m
70CONFIG_INET_UDP_DIAG=m 67CONFIG_INET_UDP_DIAG=m
71CONFIG_INET_RAW_DIAG=m 68CONFIG_INET_RAW_DIAG=m
@@ -197,7 +194,6 @@ CONFIG_IP_SET_HASH_NETNET=m
197CONFIG_IP_SET_HASH_NETPORT=m 194CONFIG_IP_SET_HASH_NETPORT=m
198CONFIG_IP_SET_HASH_NETIFACE=m 195CONFIG_IP_SET_HASH_NETIFACE=m
199CONFIG_IP_SET_LIST_SET=m 196CONFIG_IP_SET_LIST_SET=m
200CONFIG_NFT_CHAIN_ROUTE_IPV4=m
201CONFIG_NFT_DUP_IPV4=m 197CONFIG_NFT_DUP_IPV4=m
202CONFIG_NFT_FIB_IPV4=m 198CONFIG_NFT_FIB_IPV4=m
203CONFIG_NF_TABLES_ARP=y 199CONFIG_NF_TABLES_ARP=y
@@ -223,7 +219,6 @@ CONFIG_IP_NF_RAW=m
223CONFIG_IP_NF_ARPTABLES=m 219CONFIG_IP_NF_ARPTABLES=m
224CONFIG_IP_NF_ARPFILTER=m 220CONFIG_IP_NF_ARPFILTER=m
225CONFIG_IP_NF_ARP_MANGLE=m 221CONFIG_IP_NF_ARP_MANGLE=m
226CONFIG_NFT_CHAIN_ROUTE_IPV6=m
227CONFIG_NFT_DUP_IPV6=m 222CONFIG_NFT_DUP_IPV6=m
228CONFIG_NFT_FIB_IPV6=m 223CONFIG_NFT_FIB_IPV6=m
229CONFIG_NF_FLOW_TABLE_IPV6=m 224CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -300,7 +295,6 @@ CONFIG_AF_KCM=m
300# CONFIG_WIRELESS is not set 295# CONFIG_WIRELESS is not set
301CONFIG_PSAMPLE=m 296CONFIG_PSAMPLE=m
302CONFIG_NET_IFE=m 297CONFIG_NET_IFE=m
303# CONFIG_UEVENT_HELPER is not set
304CONFIG_DEVTMPFS=y 298CONFIG_DEVTMPFS=y
305CONFIG_DEVTMPFS_MOUNT=y 299CONFIG_DEVTMPFS_MOUNT=y
306CONFIG_TEST_ASYNC_DRIVER_PROBE=m 300CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -393,6 +387,8 @@ CONFIG_NTP_PPS=y
393CONFIG_PPS_CLIENT_LDISC=m 387CONFIG_PPS_CLIENT_LDISC=m
394CONFIG_PTP_1588_CLOCK=m 388CONFIG_PTP_1588_CLOCK=m
395# CONFIG_HWMON is not set 389# CONFIG_HWMON is not set
390# CONFIG_LCD_CLASS_DEVICE is not set
391# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
396CONFIG_HID=m 392CONFIG_HID=m
397CONFIG_HIDRAW=y 393CONFIG_HIDRAW=y
398CONFIG_UHID=m 394CONFIG_UHID=m
@@ -505,13 +501,14 @@ CONFIG_NLS_MAC_TURKISH=m
505CONFIG_DLM=m 501CONFIG_DLM=m
506CONFIG_ENCRYPTED_KEYS=m 502CONFIG_ENCRYPTED_KEYS=m
507CONFIG_HARDENED_USERCOPY=y 503CONFIG_HARDENED_USERCOPY=y
508CONFIG_CRYPTO_RSA=m
509CONFIG_CRYPTO_DH=m
510CONFIG_CRYPTO_ECDH=m
511CONFIG_CRYPTO_MANAGER=y 504CONFIG_CRYPTO_MANAGER=y
512CONFIG_CRYPTO_USER=m 505CONFIG_CRYPTO_USER=m
513CONFIG_CRYPTO_CRYPTD=m 506CONFIG_CRYPTO_CRYPTD=m
514CONFIG_CRYPTO_TEST=m 507CONFIG_CRYPTO_TEST=m
508CONFIG_CRYPTO_RSA=m
509CONFIG_CRYPTO_DH=m
510CONFIG_CRYPTO_ECDH=m
511CONFIG_CRYPTO_ECRDSA=m
515CONFIG_CRYPTO_CHACHA20POLY1305=m 512CONFIG_CRYPTO_CHACHA20POLY1305=m
516CONFIG_CRYPTO_AEGIS128=m 513CONFIG_CRYPTO_AEGIS128=m
517CONFIG_CRYPTO_AEGIS128L=m 514CONFIG_CRYPTO_AEGIS128L=m
@@ -535,7 +532,6 @@ CONFIG_CRYPTO_RMD256=m
535CONFIG_CRYPTO_RMD320=m 532CONFIG_CRYPTO_RMD320=m
536CONFIG_CRYPTO_SHA3=m 533CONFIG_CRYPTO_SHA3=m
537CONFIG_CRYPTO_SM3=m 534CONFIG_CRYPTO_SM3=m
538CONFIG_CRYPTO_STREEBOG=m
539CONFIG_CRYPTO_TGR192=m 535CONFIG_CRYPTO_TGR192=m
540CONFIG_CRYPTO_WP512=m 536CONFIG_CRYPTO_WP512=m
541CONFIG_CRYPTO_AES_TI=m 537CONFIG_CRYPTO_AES_TI=m
@@ -578,6 +574,7 @@ CONFIG_ATOMIC64_SELFTEST=m
578CONFIG_ASYNC_RAID6_TEST=m 574CONFIG_ASYNC_RAID6_TEST=m
579CONFIG_TEST_HEXDUMP=m 575CONFIG_TEST_HEXDUMP=m
580CONFIG_TEST_STRING_HELPERS=m 576CONFIG_TEST_STRING_HELPERS=m
577CONFIG_TEST_STRSCPY=m
581CONFIG_TEST_KSTRTOX=m 578CONFIG_TEST_KSTRTOX=m
582CONFIG_TEST_PRINTF=m 579CONFIG_TEST_PRINTF=m
583CONFIG_TEST_BITMAP=m 580CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index d865592a423e..f41c34d3cdd0 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -64,9 +64,6 @@ CONFIG_INET_AH=m
64CONFIG_INET_ESP=m 64CONFIG_INET_ESP=m
65CONFIG_INET_ESP_OFFLOAD=m 65CONFIG_INET_ESP_OFFLOAD=m
66CONFIG_INET_IPCOMP=m 66CONFIG_INET_IPCOMP=m
67CONFIG_INET_XFRM_MODE_TRANSPORT=m
68CONFIG_INET_XFRM_MODE_TUNNEL=m
69CONFIG_INET_XFRM_MODE_BEET=m
70CONFIG_INET_DIAG=m 67CONFIG_INET_DIAG=m
71CONFIG_INET_UDP_DIAG=m 68CONFIG_INET_UDP_DIAG=m
72CONFIG_INET_RAW_DIAG=m 69CONFIG_INET_RAW_DIAG=m
@@ -198,7 +195,6 @@ CONFIG_IP_SET_HASH_NETNET=m
198CONFIG_IP_SET_HASH_NETPORT=m 195CONFIG_IP_SET_HASH_NETPORT=m
199CONFIG_IP_SET_HASH_NETIFACE=m 196CONFIG_IP_SET_HASH_NETIFACE=m
200CONFIG_IP_SET_LIST_SET=m 197CONFIG_IP_SET_LIST_SET=m
201CONFIG_NFT_CHAIN_ROUTE_IPV4=m
202CONFIG_NFT_DUP_IPV4=m 198CONFIG_NFT_DUP_IPV4=m
203CONFIG_NFT_FIB_IPV4=m 199CONFIG_NFT_FIB_IPV4=m
204CONFIG_NF_TABLES_ARP=y 200CONFIG_NF_TABLES_ARP=y
@@ -224,7 +220,6 @@ CONFIG_IP_NF_RAW=m
224CONFIG_IP_NF_ARPTABLES=m 220CONFIG_IP_NF_ARPTABLES=m
225CONFIG_IP_NF_ARPFILTER=m 221CONFIG_IP_NF_ARPFILTER=m
226CONFIG_IP_NF_ARP_MANGLE=m 222CONFIG_IP_NF_ARP_MANGLE=m
227CONFIG_NFT_CHAIN_ROUTE_IPV6=m
228CONFIG_NFT_DUP_IPV6=m 223CONFIG_NFT_DUP_IPV6=m
229CONFIG_NFT_FIB_IPV6=m 224CONFIG_NFT_FIB_IPV6=m
230CONFIG_NF_FLOW_TABLE_IPV6=m 225CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -301,7 +296,6 @@ CONFIG_AF_KCM=m
301# CONFIG_WIRELESS is not set 296# CONFIG_WIRELESS is not set
302CONFIG_PSAMPLE=m 297CONFIG_PSAMPLE=m
303CONFIG_NET_IFE=m 298CONFIG_NET_IFE=m
304# CONFIG_UEVENT_HELPER is not set
305CONFIG_DEVTMPFS=y 299CONFIG_DEVTMPFS=y
306CONFIG_DEVTMPFS_MOUNT=y 300CONFIG_DEVTMPFS_MOUNT=y
307CONFIG_TEST_ASYNC_DRIVER_PROBE=m 301CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -394,6 +388,8 @@ CONFIG_NTP_PPS=y
394CONFIG_PPS_CLIENT_LDISC=m 388CONFIG_PPS_CLIENT_LDISC=m
395CONFIG_PTP_1588_CLOCK=m 389CONFIG_PTP_1588_CLOCK=m
396# CONFIG_HWMON is not set 390# CONFIG_HWMON is not set
391# CONFIG_LCD_CLASS_DEVICE is not set
392# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
397CONFIG_HID=m 393CONFIG_HID=m
398CONFIG_HIDRAW=y 394CONFIG_HIDRAW=y
399CONFIG_UHID=m 395CONFIG_UHID=m
@@ -506,13 +502,14 @@ CONFIG_NLS_MAC_TURKISH=m
506CONFIG_DLM=m 502CONFIG_DLM=m
507CONFIG_ENCRYPTED_KEYS=m 503CONFIG_ENCRYPTED_KEYS=m
508CONFIG_HARDENED_USERCOPY=y 504CONFIG_HARDENED_USERCOPY=y
509CONFIG_CRYPTO_RSA=m
510CONFIG_CRYPTO_DH=m
511CONFIG_CRYPTO_ECDH=m
512CONFIG_CRYPTO_MANAGER=y 505CONFIG_CRYPTO_MANAGER=y
513CONFIG_CRYPTO_USER=m 506CONFIG_CRYPTO_USER=m
514CONFIG_CRYPTO_CRYPTD=m 507CONFIG_CRYPTO_CRYPTD=m
515CONFIG_CRYPTO_TEST=m 508CONFIG_CRYPTO_TEST=m
509CONFIG_CRYPTO_RSA=m
510CONFIG_CRYPTO_DH=m
511CONFIG_CRYPTO_ECDH=m
512CONFIG_CRYPTO_ECRDSA=m
516CONFIG_CRYPTO_CHACHA20POLY1305=m 513CONFIG_CRYPTO_CHACHA20POLY1305=m
517CONFIG_CRYPTO_AEGIS128=m 514CONFIG_CRYPTO_AEGIS128=m
518CONFIG_CRYPTO_AEGIS128L=m 515CONFIG_CRYPTO_AEGIS128L=m
@@ -536,7 +533,6 @@ CONFIG_CRYPTO_RMD256=m
536CONFIG_CRYPTO_RMD320=m 533CONFIG_CRYPTO_RMD320=m
537CONFIG_CRYPTO_SHA3=m 534CONFIG_CRYPTO_SHA3=m
538CONFIG_CRYPTO_SM3=m 535CONFIG_CRYPTO_SM3=m
539CONFIG_CRYPTO_STREEBOG=m
540CONFIG_CRYPTO_TGR192=m 536CONFIG_CRYPTO_TGR192=m
541CONFIG_CRYPTO_WP512=m 537CONFIG_CRYPTO_WP512=m
542CONFIG_CRYPTO_AES_TI=m 538CONFIG_CRYPTO_AES_TI=m
@@ -579,6 +575,7 @@ CONFIG_ATOMIC64_SELFTEST=m
579CONFIG_ASYNC_RAID6_TEST=m 575CONFIG_ASYNC_RAID6_TEST=m
580CONFIG_TEST_HEXDUMP=m 576CONFIG_TEST_HEXDUMP=m
581CONFIG_TEST_STRING_HELPERS=m 577CONFIG_TEST_STRING_HELPERS=m
578CONFIG_TEST_STRSCPY=m
582CONFIG_TEST_KSTRTOX=m 579CONFIG_TEST_KSTRTOX=m
583CONFIG_TEST_PRINTF=m 580CONFIG_TEST_PRINTF=m
584CONFIG_TEST_BITMAP=m 581CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 034a9de90484..c9d2cb0a1cf4 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -65,9 +65,6 @@ CONFIG_INET_AH=m
65CONFIG_INET_ESP=m 65CONFIG_INET_ESP=m
66CONFIG_INET_ESP_OFFLOAD=m 66CONFIG_INET_ESP_OFFLOAD=m
67CONFIG_INET_IPCOMP=m 67CONFIG_INET_IPCOMP=m
68CONFIG_INET_XFRM_MODE_TRANSPORT=m
69CONFIG_INET_XFRM_MODE_TUNNEL=m
70CONFIG_INET_XFRM_MODE_BEET=m
71CONFIG_INET_DIAG=m 68CONFIG_INET_DIAG=m
72CONFIG_INET_UDP_DIAG=m 69CONFIG_INET_UDP_DIAG=m
73CONFIG_INET_RAW_DIAG=m 70CONFIG_INET_RAW_DIAG=m
@@ -199,7 +196,6 @@ CONFIG_IP_SET_HASH_NETNET=m
199CONFIG_IP_SET_HASH_NETPORT=m 196CONFIG_IP_SET_HASH_NETPORT=m
200CONFIG_IP_SET_HASH_NETIFACE=m 197CONFIG_IP_SET_HASH_NETIFACE=m
201CONFIG_IP_SET_LIST_SET=m 198CONFIG_IP_SET_LIST_SET=m
202CONFIG_NFT_CHAIN_ROUTE_IPV4=m
203CONFIG_NFT_DUP_IPV4=m 199CONFIG_NFT_DUP_IPV4=m
204CONFIG_NFT_FIB_IPV4=m 200CONFIG_NFT_FIB_IPV4=m
205CONFIG_NF_TABLES_ARP=y 201CONFIG_NF_TABLES_ARP=y
@@ -225,7 +221,6 @@ CONFIG_IP_NF_RAW=m
225CONFIG_IP_NF_ARPTABLES=m 221CONFIG_IP_NF_ARPTABLES=m
226CONFIG_IP_NF_ARPFILTER=m 222CONFIG_IP_NF_ARPFILTER=m
227CONFIG_IP_NF_ARP_MANGLE=m 223CONFIG_IP_NF_ARP_MANGLE=m
228CONFIG_NFT_CHAIN_ROUTE_IPV6=m
229CONFIG_NFT_DUP_IPV6=m 224CONFIG_NFT_DUP_IPV6=m
230CONFIG_NFT_FIB_IPV6=m 225CONFIG_NFT_FIB_IPV6=m
231CONFIG_NF_FLOW_TABLE_IPV6=m 226CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -302,7 +297,6 @@ CONFIG_AF_KCM=m
302# CONFIG_WIRELESS is not set 297# CONFIG_WIRELESS is not set
303CONFIG_PSAMPLE=m 298CONFIG_PSAMPLE=m
304CONFIG_NET_IFE=m 299CONFIG_NET_IFE=m
305# CONFIG_UEVENT_HELPER is not set
306CONFIG_DEVTMPFS=y 300CONFIG_DEVTMPFS=y
307CONFIG_DEVTMPFS_MOUNT=y 301CONFIG_DEVTMPFS_MOUNT=y
308CONFIG_TEST_ASYNC_DRIVER_PROBE=m 302CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -408,6 +402,8 @@ CONFIG_PPS_CLIENT_PARPORT=m
408CONFIG_PTP_1588_CLOCK=m 402CONFIG_PTP_1588_CLOCK=m
409# CONFIG_HWMON is not set 403# CONFIG_HWMON is not set
410CONFIG_FB=y 404CONFIG_FB=y
405# CONFIG_LCD_CLASS_DEVICE is not set
406# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
411CONFIG_FRAMEBUFFER_CONSOLE=y 407CONFIG_FRAMEBUFFER_CONSOLE=y
412CONFIG_LOGO=y 408CONFIG_LOGO=y
413CONFIG_SOUND=m 409CONFIG_SOUND=m
@@ -524,13 +520,14 @@ CONFIG_NLS_MAC_TURKISH=m
524CONFIG_DLM=m 520CONFIG_DLM=m
525CONFIG_ENCRYPTED_KEYS=m 521CONFIG_ENCRYPTED_KEYS=m
526CONFIG_HARDENED_USERCOPY=y 522CONFIG_HARDENED_USERCOPY=y
527CONFIG_CRYPTO_RSA=m
528CONFIG_CRYPTO_DH=m
529CONFIG_CRYPTO_ECDH=m
530CONFIG_CRYPTO_MANAGER=y 523CONFIG_CRYPTO_MANAGER=y
531CONFIG_CRYPTO_USER=m 524CONFIG_CRYPTO_USER=m
532CONFIG_CRYPTO_CRYPTD=m 525CONFIG_CRYPTO_CRYPTD=m
533CONFIG_CRYPTO_TEST=m 526CONFIG_CRYPTO_TEST=m
527CONFIG_CRYPTO_RSA=m
528CONFIG_CRYPTO_DH=m
529CONFIG_CRYPTO_ECDH=m
530CONFIG_CRYPTO_ECRDSA=m
534CONFIG_CRYPTO_CHACHA20POLY1305=m 531CONFIG_CRYPTO_CHACHA20POLY1305=m
535CONFIG_CRYPTO_AEGIS128=m 532CONFIG_CRYPTO_AEGIS128=m
536CONFIG_CRYPTO_AEGIS128L=m 533CONFIG_CRYPTO_AEGIS128L=m
@@ -554,7 +551,6 @@ CONFIG_CRYPTO_RMD256=m
554CONFIG_CRYPTO_RMD320=m 551CONFIG_CRYPTO_RMD320=m
555CONFIG_CRYPTO_SHA3=m 552CONFIG_CRYPTO_SHA3=m
556CONFIG_CRYPTO_SM3=m 553CONFIG_CRYPTO_SM3=m
557CONFIG_CRYPTO_STREEBOG=m
558CONFIG_CRYPTO_TGR192=m 554CONFIG_CRYPTO_TGR192=m
559CONFIG_CRYPTO_WP512=m 555CONFIG_CRYPTO_WP512=m
560CONFIG_CRYPTO_AES_TI=m 556CONFIG_CRYPTO_AES_TI=m
@@ -597,6 +593,7 @@ CONFIG_ATOMIC64_SELFTEST=m
597CONFIG_ASYNC_RAID6_TEST=m 593CONFIG_ASYNC_RAID6_TEST=m
598CONFIG_TEST_HEXDUMP=m 594CONFIG_TEST_HEXDUMP=m
599CONFIG_TEST_STRING_HELPERS=m 595CONFIG_TEST_STRING_HELPERS=m
596CONFIG_TEST_STRSCPY=m
600CONFIG_TEST_KSTRTOX=m 597CONFIG_TEST_KSTRTOX=m
601CONFIG_TEST_PRINTF=m 598CONFIG_TEST_PRINTF=m
602CONFIG_TEST_BITMAP=m 599CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 49be0f9fcd8d..79a64fdd6bf0 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -61,9 +61,6 @@ CONFIG_INET_AH=m
61CONFIG_INET_ESP=m 61CONFIG_INET_ESP=m
62CONFIG_INET_ESP_OFFLOAD=m 62CONFIG_INET_ESP_OFFLOAD=m
63CONFIG_INET_IPCOMP=m 63CONFIG_INET_IPCOMP=m
64CONFIG_INET_XFRM_MODE_TRANSPORT=m
65CONFIG_INET_XFRM_MODE_TUNNEL=m
66CONFIG_INET_XFRM_MODE_BEET=m
67CONFIG_INET_DIAG=m 64CONFIG_INET_DIAG=m
68CONFIG_INET_UDP_DIAG=m 65CONFIG_INET_UDP_DIAG=m
69CONFIG_INET_RAW_DIAG=m 66CONFIG_INET_RAW_DIAG=m
@@ -195,7 +192,6 @@ CONFIG_IP_SET_HASH_NETNET=m
195CONFIG_IP_SET_HASH_NETPORT=m 192CONFIG_IP_SET_HASH_NETPORT=m
196CONFIG_IP_SET_HASH_NETIFACE=m 193CONFIG_IP_SET_HASH_NETIFACE=m
197CONFIG_IP_SET_LIST_SET=m 194CONFIG_IP_SET_LIST_SET=m
198CONFIG_NFT_CHAIN_ROUTE_IPV4=m
199CONFIG_NFT_DUP_IPV4=m 195CONFIG_NFT_DUP_IPV4=m
200CONFIG_NFT_FIB_IPV4=m 196CONFIG_NFT_FIB_IPV4=m
201CONFIG_NF_TABLES_ARP=y 197CONFIG_NF_TABLES_ARP=y
@@ -221,7 +217,6 @@ CONFIG_IP_NF_RAW=m
221CONFIG_IP_NF_ARPTABLES=m 217CONFIG_IP_NF_ARPTABLES=m
222CONFIG_IP_NF_ARPFILTER=m 218CONFIG_IP_NF_ARPFILTER=m
223CONFIG_IP_NF_ARP_MANGLE=m 219CONFIG_IP_NF_ARP_MANGLE=m
224CONFIG_NFT_CHAIN_ROUTE_IPV6=m
225CONFIG_NFT_DUP_IPV6=m 220CONFIG_NFT_DUP_IPV6=m
226CONFIG_NFT_FIB_IPV6=m 221CONFIG_NFT_FIB_IPV6=m
227CONFIG_NF_FLOW_TABLE_IPV6=m 222CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -298,7 +293,6 @@ CONFIG_AF_KCM=m
298# CONFIG_WIRELESS is not set 293# CONFIG_WIRELESS is not set
299CONFIG_PSAMPLE=m 294CONFIG_PSAMPLE=m
300CONFIG_NET_IFE=m 295CONFIG_NET_IFE=m
301# CONFIG_UEVENT_HELPER is not set
302CONFIG_DEVTMPFS=y 296CONFIG_DEVTMPFS=y
303CONFIG_DEVTMPFS_MOUNT=y 297CONFIG_DEVTMPFS_MOUNT=y
304CONFIG_TEST_ASYNC_DRIVER_PROBE=m 298CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -394,6 +388,8 @@ CONFIG_PPS_CLIENT_LDISC=m
394CONFIG_PTP_1588_CLOCK=m 388CONFIG_PTP_1588_CLOCK=m
395# CONFIG_HWMON is not set 389# CONFIG_HWMON is not set
396CONFIG_FB=y 390CONFIG_FB=y
391# CONFIG_LCD_CLASS_DEVICE is not set
392# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
397CONFIG_FRAMEBUFFER_CONSOLE=y 393CONFIG_FRAMEBUFFER_CONSOLE=y
398CONFIG_LOGO=y 394CONFIG_LOGO=y
399CONFIG_HID=m 395CONFIG_HID=m
@@ -508,13 +504,14 @@ CONFIG_NLS_MAC_TURKISH=m
508CONFIG_DLM=m 504CONFIG_DLM=m
509CONFIG_ENCRYPTED_KEYS=m 505CONFIG_ENCRYPTED_KEYS=m
510CONFIG_HARDENED_USERCOPY=y 506CONFIG_HARDENED_USERCOPY=y
511CONFIG_CRYPTO_RSA=m
512CONFIG_CRYPTO_DH=m
513CONFIG_CRYPTO_ECDH=m
514CONFIG_CRYPTO_MANAGER=y 507CONFIG_CRYPTO_MANAGER=y
515CONFIG_CRYPTO_USER=m 508CONFIG_CRYPTO_USER=m
516CONFIG_CRYPTO_CRYPTD=m 509CONFIG_CRYPTO_CRYPTD=m
517CONFIG_CRYPTO_TEST=m 510CONFIG_CRYPTO_TEST=m
511CONFIG_CRYPTO_RSA=m
512CONFIG_CRYPTO_DH=m
513CONFIG_CRYPTO_ECDH=m
514CONFIG_CRYPTO_ECRDSA=m
518CONFIG_CRYPTO_CHACHA20POLY1305=m 515CONFIG_CRYPTO_CHACHA20POLY1305=m
519CONFIG_CRYPTO_AEGIS128=m 516CONFIG_CRYPTO_AEGIS128=m
520CONFIG_CRYPTO_AEGIS128L=m 517CONFIG_CRYPTO_AEGIS128L=m
@@ -538,7 +535,6 @@ CONFIG_CRYPTO_RMD256=m
538CONFIG_CRYPTO_RMD320=m 535CONFIG_CRYPTO_RMD320=m
539CONFIG_CRYPTO_SHA3=m 536CONFIG_CRYPTO_SHA3=m
540CONFIG_CRYPTO_SM3=m 537CONFIG_CRYPTO_SM3=m
541CONFIG_CRYPTO_STREEBOG=m
542CONFIG_CRYPTO_TGR192=m 538CONFIG_CRYPTO_TGR192=m
543CONFIG_CRYPTO_WP512=m 539CONFIG_CRYPTO_WP512=m
544CONFIG_CRYPTO_AES_TI=m 540CONFIG_CRYPTO_AES_TI=m
@@ -581,6 +577,7 @@ CONFIG_ATOMIC64_SELFTEST=m
581CONFIG_ASYNC_RAID6_TEST=m 577CONFIG_ASYNC_RAID6_TEST=m
582CONFIG_TEST_HEXDUMP=m 578CONFIG_TEST_HEXDUMP=m
583CONFIG_TEST_STRING_HELPERS=m 579CONFIG_TEST_STRING_HELPERS=m
580CONFIG_TEST_STRSCPY=m
584CONFIG_TEST_KSTRTOX=m 581CONFIG_TEST_KSTRTOX=m
585CONFIG_TEST_PRINTF=m 582CONFIG_TEST_PRINTF=m
586CONFIG_TEST_BITMAP=m 583CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index a71acf4a6004..e3402a5d165b 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -61,9 +61,6 @@ CONFIG_INET_AH=m
61CONFIG_INET_ESP=m 61CONFIG_INET_ESP=m
62CONFIG_INET_ESP_OFFLOAD=m 62CONFIG_INET_ESP_OFFLOAD=m
63CONFIG_INET_IPCOMP=m 63CONFIG_INET_IPCOMP=m
64CONFIG_INET_XFRM_MODE_TRANSPORT=m
65CONFIG_INET_XFRM_MODE_TUNNEL=m
66CONFIG_INET_XFRM_MODE_BEET=m
67CONFIG_INET_DIAG=m 64CONFIG_INET_DIAG=m
68CONFIG_INET_UDP_DIAG=m 65CONFIG_INET_UDP_DIAG=m
69CONFIG_INET_RAW_DIAG=m 66CONFIG_INET_RAW_DIAG=m
@@ -195,7 +192,6 @@ CONFIG_IP_SET_HASH_NETNET=m
195CONFIG_IP_SET_HASH_NETPORT=m 192CONFIG_IP_SET_HASH_NETPORT=m
196CONFIG_IP_SET_HASH_NETIFACE=m 193CONFIG_IP_SET_HASH_NETIFACE=m
197CONFIG_IP_SET_LIST_SET=m 194CONFIG_IP_SET_LIST_SET=m
198CONFIG_NFT_CHAIN_ROUTE_IPV4=m
199CONFIG_NFT_DUP_IPV4=m 195CONFIG_NFT_DUP_IPV4=m
200CONFIG_NFT_FIB_IPV4=m 196CONFIG_NFT_FIB_IPV4=m
201CONFIG_NF_TABLES_ARP=y 197CONFIG_NF_TABLES_ARP=y
@@ -221,7 +217,6 @@ CONFIG_IP_NF_RAW=m
221CONFIG_IP_NF_ARPTABLES=m 217CONFIG_IP_NF_ARPTABLES=m
222CONFIG_IP_NF_ARPFILTER=m 218CONFIG_IP_NF_ARPFILTER=m
223CONFIG_IP_NF_ARP_MANGLE=m 219CONFIG_IP_NF_ARP_MANGLE=m
224CONFIG_NFT_CHAIN_ROUTE_IPV6=m
225CONFIG_NFT_DUP_IPV6=m 220CONFIG_NFT_DUP_IPV6=m
226CONFIG_NFT_FIB_IPV6=m 221CONFIG_NFT_FIB_IPV6=m
227CONFIG_NF_FLOW_TABLE_IPV6=m 222CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -298,7 +293,6 @@ CONFIG_AF_KCM=m
298# CONFIG_WIRELESS is not set 293# CONFIG_WIRELESS is not set
299CONFIG_PSAMPLE=m 294CONFIG_PSAMPLE=m
300CONFIG_NET_IFE=m 295CONFIG_NET_IFE=m
301# CONFIG_UEVENT_HELPER is not set
302CONFIG_DEVTMPFS=y 296CONFIG_DEVTMPFS=y
303CONFIG_DEVTMPFS_MOUNT=y 297CONFIG_DEVTMPFS_MOUNT=y
304CONFIG_TEST_ASYNC_DRIVER_PROBE=m 298CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@@ -393,6 +387,8 @@ CONFIG_PPS_CLIENT_LDISC=m
393CONFIG_PTP_1588_CLOCK=m 387CONFIG_PTP_1588_CLOCK=m
394# CONFIG_HWMON is not set 388# CONFIG_HWMON is not set
395CONFIG_FB=y 389CONFIG_FB=y
390# CONFIG_LCD_CLASS_DEVICE is not set
391# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
396CONFIG_FRAMEBUFFER_CONSOLE=y 392CONFIG_FRAMEBUFFER_CONSOLE=y
397CONFIG_LOGO=y 393CONFIG_LOGO=y
398CONFIG_HID=m 394CONFIG_HID=m
@@ -507,13 +503,14 @@ CONFIG_NLS_MAC_TURKISH=m
507CONFIG_DLM=m 503CONFIG_DLM=m
508CONFIG_ENCRYPTED_KEYS=m 504CONFIG_ENCRYPTED_KEYS=m
509CONFIG_HARDENED_USERCOPY=y 505CONFIG_HARDENED_USERCOPY=y
510CONFIG_CRYPTO_RSA=m
511CONFIG_CRYPTO_DH=m
512CONFIG_CRYPTO_ECDH=m
513CONFIG_CRYPTO_MANAGER=y 506CONFIG_CRYPTO_MANAGER=y
514CONFIG_CRYPTO_USER=m 507CONFIG_CRYPTO_USER=m
515CONFIG_CRYPTO_CRYPTD=m 508CONFIG_CRYPTO_CRYPTD=m
516CONFIG_CRYPTO_TEST=m 509CONFIG_CRYPTO_TEST=m
510CONFIG_CRYPTO_RSA=m
511CONFIG_CRYPTO_DH=m
512CONFIG_CRYPTO_ECDH=m
513CONFIG_CRYPTO_ECRDSA=m
517CONFIG_CRYPTO_CHACHA20POLY1305=m 514CONFIG_CRYPTO_CHACHA20POLY1305=m
518CONFIG_CRYPTO_AEGIS128=m 515CONFIG_CRYPTO_AEGIS128=m
519CONFIG_CRYPTO_AEGIS128L=m 516CONFIG_CRYPTO_AEGIS128L=m
@@ -537,7 +534,6 @@ CONFIG_CRYPTO_RMD256=m
537CONFIG_CRYPTO_RMD320=m 534CONFIG_CRYPTO_RMD320=m
538CONFIG_CRYPTO_SHA3=m 535CONFIG_CRYPTO_SHA3=m
539CONFIG_CRYPTO_SM3=m 536CONFIG_CRYPTO_SM3=m
540CONFIG_CRYPTO_STREEBOG=m
541CONFIG_CRYPTO_TGR192=m 537CONFIG_CRYPTO_TGR192=m
542CONFIG_CRYPTO_WP512=m 538CONFIG_CRYPTO_WP512=m
543CONFIG_CRYPTO_AES_TI=m 539CONFIG_CRYPTO_AES_TI=m
@@ -580,6 +576,7 @@ CONFIG_ATOMIC64_SELFTEST=m
580CONFIG_ASYNC_RAID6_TEST=m 576CONFIG_ASYNC_RAID6_TEST=m
581CONFIG_TEST_HEXDUMP=m 577CONFIG_TEST_HEXDUMP=m
582CONFIG_TEST_STRING_HELPERS=m 578CONFIG_TEST_STRING_HELPERS=m
579CONFIG_TEST_STRSCPY=m
583CONFIG_TEST_KSTRTOX=m 580CONFIG_TEST_KSTRTOX=m
584CONFIG_TEST_PRINTF=m 581CONFIG_TEST_PRINTF=m
585CONFIG_TEST_BITMAP=m 582CONFIG_TEST_BITMAP=m
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c
index b4aa853051bd..30cd59caf037 100644
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
@@ -18,57 +18,22 @@
18#include <asm/pgalloc.h> 18#include <asm/pgalloc.h>
19 19
20#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) 20#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
21 21void arch_dma_prep_coherent(struct page *page, size_t size)
22void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
23 gfp_t flag, unsigned long attrs)
24{ 22{
25 struct page *page, **map; 23 cache_push(page_to_phys(page), size);
26 pgprot_t pgprot;
27 void *addr;
28 int i, order;
29
30 pr_debug("dma_alloc_coherent: %d,%x\n", size, flag);
31
32 size = PAGE_ALIGN(size);
33 order = get_order(size);
34
35 page = alloc_pages(flag | __GFP_ZERO, order);
36 if (!page)
37 return NULL;
38
39 *handle = page_to_phys(page);
40 map = kmalloc(sizeof(struct page *) << order, flag & ~__GFP_DMA);
41 if (!map) {
42 __free_pages(page, order);
43 return NULL;
44 }
45 split_page(page, order);
46
47 order = 1 << order;
48 size >>= PAGE_SHIFT;
49 map[0] = page;
50 for (i = 1; i < size; i++)
51 map[i] = page + i;
52 for (; i < order; i++)
53 __free_page(page + i);
54 pgprot = __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
55 if (CPU_IS_040_OR_060)
56 pgprot_val(pgprot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S;
57 else
58 pgprot_val(pgprot) |= _PAGE_NOCACHE030;
59 addr = vmap(map, size, VM_MAP, pgprot);
60 kfree(map);
61
62 return addr;
63} 24}
64 25
65void arch_dma_free(struct device *dev, size_t size, void *addr, 26pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,
66 dma_addr_t handle, unsigned long attrs) 27 unsigned long attrs)
67{ 28{
68 pr_debug("dma_free_coherent: %p, %x\n", addr, handle); 29 if (CPU_IS_040_OR_060) {
69 vfree(addr); 30 pgprot_val(prot) &= ~_PAGE_CACHE040;
31 pgprot_val(prot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S;
32 } else {
33 pgprot_val(prot) |= _PAGE_NOCACHE030;
34 }
35 return prot;
70} 36}
71
72#else 37#else
73 38
74#include <asm/cacheflush.h> 39#include <asm/cacheflush.h>
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-17 05:58:43 -0400