Skip to content

Commit 3bb38c5

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - ptdescs conversions - Fix lost column on the graphical debug console - Replace __ASSEMBLY__ with __ASSEMBLER__ in headers - Miscellaneous fixes and improvements - defconfig updates * tag 'm68k-for-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: mac: Improve clocksource driver commentary m68k: defconfig: Update defconfigs for v6.16-rc2 m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers m68k: Enable dead code elimination m68k: Don't unregister boot console needlessly m68k: Remove unused "cursor home" code from debug console m68k: Avoid pointless recursion in debug console rendering m68k: Fix lost column on framebuffer debug console m68k: mm: Convert pointer table macros to use ptdescs m68k: mm: Convert init_pointer_table() to use ptdescs m68k: mm: Convert free_pointer_table() to use ptdescs m68k: mm: Convert get_pointer_table() to use ptdescs
2 parents bc46b7c + c899593 commit 3bb38c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+270
-180
lines changed

‎arch/m68k/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ config M68K
3232
select HAVE_ASM_MODVERSIONS
3333
select HAVE_DEBUG_BUGVERBOSE
3434
select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED
35+
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
3536
select HAVE_MOD_ARCH_SPECIFIC
3637
select HAVE_UID16
3738
select MMU_GATHER_NO_RANGE if MMU

‎arch/m68k/Kconfig.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config BOOTPARAM_STRING
1010

1111
config EARLY_PRINTK
1212
bool "Early printk"
13-
depends on !(SUN3 || M68000 || COLDFIRE)
13+
depends on MMU_MOTOROLA
1414
help
1515
Write kernel log output directly to a serial port.
1616
Where implemented, output goes to the framebuffer as well.

‎arch/m68k/configs/amiga_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
267267
CONFIG_BRIDGE_EBT_SNAT=m
268268
CONFIG_BRIDGE_EBT_LOG=m
269269
CONFIG_BRIDGE_EBT_NFLOG=m
270+
CONFIG_IP_SCTP=m
270271
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
271272
CONFIG_RDS=m
272273
CONFIG_RDS_TCP=m
@@ -356,6 +357,7 @@ CONFIG_TCM_PSCSI=m
356357
CONFIG_NETDEVICES=y
357358
CONFIG_DUMMY=m
358359
CONFIG_WIREGUARD=m
360+
CONFIG_OVPN=m
359361
CONFIG_EQUALIZER=m
360362
CONFIG_NET_TEAM=m
361363
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -375,6 +377,7 @@ CONFIG_PFCP=m
375377
CONFIG_MACSEC=m
376378
CONFIG_NETCONSOLE=m
377379
CONFIG_NETCONSOLE_DYNAMIC=y
380+
CONFIG_TUN=m
378381
CONFIG_VETH=m
379382
CONFIG_A2065=y
380383
CONFIG_ARIADNE=y
@@ -448,8 +451,10 @@ CONFIG_RTC_DRV_RP5C01=m
448451
CONFIG_DAX=m
449452
CONFIG_EXT4_FS=y
450453
CONFIG_JFS_FS=m
454+
CONFIG_XFS_FS=m
451455
CONFIG_OCFS2_FS=m
452456
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
457+
CONFIG_BTRFS_FS=m
453458
CONFIG_BCACHEFS_FS=m
454459
CONFIG_FANOTIFY=y
455460
CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -548,6 +553,7 @@ CONFIG_DLM=m
548553
CONFIG_ENCRYPTED_KEYS=m
549554
CONFIG_HARDENED_USERCOPY=y
550555
CONFIG_CRYPTO_USER=m
556+
CONFIG_CRYPTO_NULL=m
551557
CONFIG_CRYPTO_CRYPTD=m
552558
CONFIG_CRYPTO_BENCHMARK=m
553559
CONFIG_CRYPTO_RSA=m
@@ -580,7 +586,6 @@ CONFIG_CRYPTO_LRW=m
580586
CONFIG_CRYPTO_PCBC=m
581587
CONFIG_CRYPTO_XTS=m
582588
CONFIG_CRYPTO_AEGIS128=m
583-
CONFIG_CRYPTO_CHACHA20POLY1305=m
584589
CONFIG_CRYPTO_MD4=m
585590
CONFIG_CRYPTO_MICHAEL_MIC=m
586591
CONFIG_CRYPTO_RMD160=m
@@ -600,6 +605,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
600605
CONFIG_CRYPTO_USER_API_RNG=m
601606
CONFIG_CRYPTO_USER_API_AEAD=m
602607
# CONFIG_CRYPTO_HW is not set
608+
CONFIG_PRIME_NUMBERS=m
603609
CONFIG_XZ_DEC_TEST=m
604610
CONFIG_GLOB_SELFTEST=m
605611
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -631,6 +637,7 @@ CONFIG_FIND_BIT_BENCHMARK=m
631637
CONFIG_TEST_FIRMWARE=m
632638
CONFIG_TEST_SYSCTL=m
633639
CONFIG_LINEAR_RANGES_TEST=m
640+
CONFIG_CRC_BENCHMARK=y
634641
CONFIG_TEST_UDELAY=m
635642
CONFIG_TEST_STATIC_KEYS=m
636643
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
263263
CONFIG_BRIDGE_EBT_SNAT=m
264264
CONFIG_BRIDGE_EBT_LOG=m
265265
CONFIG_BRIDGE_EBT_NFLOG=m
266+
CONFIG_IP_SCTP=m
266267
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
267268
CONFIG_RDS=m
268269
CONFIG_RDS_TCP=m
@@ -336,6 +337,7 @@ CONFIG_TCM_PSCSI=m
336337
CONFIG_NETDEVICES=y
337338
CONFIG_DUMMY=m
338339
CONFIG_WIREGUARD=m
340+
CONFIG_OVPN=m
339341
CONFIG_EQUALIZER=m
340342
CONFIG_NET_TEAM=m
341343
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -355,6 +357,7 @@ CONFIG_PFCP=m
355357
CONFIG_MACSEC=m
356358
CONFIG_NETCONSOLE=m
357359
CONFIG_NETCONSOLE_DYNAMIC=y
360+
CONFIG_TUN=m
358361
CONFIG_VETH=m
359362
CONFIG_PPP=m
360363
CONFIG_PPP_BSDCOMP=m
@@ -405,8 +408,10 @@ CONFIG_RTC_DRV_GENERIC=m
405408
CONFIG_DAX=m
406409
CONFIG_EXT4_FS=y
407410
CONFIG_JFS_FS=m
411+
CONFIG_XFS_FS=m
408412
CONFIG_OCFS2_FS=m
409413
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
414+
CONFIG_BTRFS_FS=m
410415
CONFIG_BCACHEFS_FS=m
411416
CONFIG_FANOTIFY=y
412417
CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -505,6 +510,7 @@ CONFIG_DLM=m
505510
CONFIG_ENCRYPTED_KEYS=m
506511
CONFIG_HARDENED_USERCOPY=y
507512
CONFIG_CRYPTO_USER=m
513+
CONFIG_CRYPTO_NULL=m
508514
CONFIG_CRYPTO_CRYPTD=m
509515
CONFIG_CRYPTO_BENCHMARK=m
510516
CONFIG_CRYPTO_RSA=m
@@ -537,7 +543,6 @@ CONFIG_CRYPTO_LRW=m
537543
CONFIG_CRYPTO_PCBC=m
538544
CONFIG_CRYPTO_XTS=m
539545
CONFIG_CRYPTO_AEGIS128=m
540-
CONFIG_CRYPTO_CHACHA20POLY1305=m
541546
CONFIG_CRYPTO_MD4=m
542547
CONFIG_CRYPTO_MICHAEL_MIC=m
543548
CONFIG_CRYPTO_RMD160=m
@@ -557,6 +562,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
557562
CONFIG_CRYPTO_USER_API_RNG=m
558563
CONFIG_CRYPTO_USER_API_AEAD=m
559564
# CONFIG_CRYPTO_HW is not set
565+
CONFIG_PRIME_NUMBERS=m
560566
CONFIG_XZ_DEC_TEST=m
561567
CONFIG_GLOB_SELFTEST=m
562568
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -588,6 +594,7 @@ CONFIG_FIND_BIT_BENCHMARK=m
588594
CONFIG_TEST_FIRMWARE=m
589595
CONFIG_TEST_SYSCTL=m
590596
CONFIG_LINEAR_RANGES_TEST=m
597+
CONFIG_CRC_BENCHMARK=y
591598
CONFIG_TEST_UDELAY=m
592599
CONFIG_TEST_STATIC_KEYS=m
593600
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
270270
CONFIG_BRIDGE_EBT_SNAT=m
271271
CONFIG_BRIDGE_EBT_LOG=m
272272
CONFIG_BRIDGE_EBT_NFLOG=m
273+
CONFIG_IP_SCTP=m
273274
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
274275
CONFIG_RDS=m
275276
CONFIG_RDS_TCP=m
@@ -351,6 +352,7 @@ CONFIG_TCM_PSCSI=m
351352
CONFIG_NETDEVICES=y
352353
CONFIG_DUMMY=m
353354
CONFIG_WIREGUARD=m
355+
CONFIG_OVPN=m
354356
CONFIG_EQUALIZER=m
355357
CONFIG_NET_TEAM=m
356358
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -370,6 +372,7 @@ CONFIG_PFCP=m
370372
CONFIG_MACSEC=m
371373
CONFIG_NETCONSOLE=m
372374
CONFIG_NETCONSOLE_DYNAMIC=y
375+
CONFIG_TUN=m
373376
CONFIG_VETH=m
374377
CONFIG_ATARILANCE=y
375378
CONFIG_NE2000=y
@@ -425,8 +428,10 @@ CONFIG_RTC_DRV_GENERIC=m
425428
CONFIG_DAX=m
426429
CONFIG_EXT4_FS=y
427430
CONFIG_JFS_FS=m
431+
CONFIG_XFS_FS=m
428432
CONFIG_OCFS2_FS=m
429433
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
434+
CONFIG_BTRFS_FS=m
430435
CONFIG_BCACHEFS_FS=m
431436
CONFIG_FANOTIFY=y
432437
CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -525,6 +530,7 @@ CONFIG_DLM=m
525530
CONFIG_ENCRYPTED_KEYS=m
526531
CONFIG_HARDENED_USERCOPY=y
527532
CONFIG_CRYPTO_USER=m
533+
CONFIG_CRYPTO_NULL=m
528534
CONFIG_CRYPTO_CRYPTD=m
529535
CONFIG_CRYPTO_BENCHMARK=m
530536
CONFIG_CRYPTO_RSA=m
@@ -557,7 +563,6 @@ CONFIG_CRYPTO_LRW=m
557563
CONFIG_CRYPTO_PCBC=m
558564
CONFIG_CRYPTO_XTS=m
559565
CONFIG_CRYPTO_AEGIS128=m
560-
CONFIG_CRYPTO_CHACHA20POLY1305=m
561566
CONFIG_CRYPTO_MD4=m
562567
CONFIG_CRYPTO_MICHAEL_MIC=m
563568
CONFIG_CRYPTO_RMD160=m
@@ -577,6 +582,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
577582
CONFIG_CRYPTO_USER_API_RNG=m
578583
CONFIG_CRYPTO_USER_API_AEAD=m
579584
# CONFIG_CRYPTO_HW is not set
585+
CONFIG_PRIME_NUMBERS=m
580586
CONFIG_XZ_DEC_TEST=m
581587
CONFIG_GLOB_SELFTEST=m
582588
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -608,6 +614,7 @@ CONFIG_FIND_BIT_BENCHMARK=m
608614
CONFIG_TEST_FIRMWARE=m
609615
CONFIG_TEST_SYSCTL=m
610616
CONFIG_LINEAR_RANGES_TEST=m
617+
CONFIG_CRC_BENCHMARK=y
611618
CONFIG_TEST_UDELAY=m
612619
CONFIG_TEST_STATIC_KEYS=m
613620
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
260260
CONFIG_BRIDGE_EBT_SNAT=m
261261
CONFIG_BRIDGE_EBT_LOG=m
262262
CONFIG_BRIDGE_EBT_NFLOG=m
263+
CONFIG_IP_SCTP=m
263264
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
264265
CONFIG_RDS=m
265266
CONFIG_RDS_TCP=m
@@ -334,6 +335,7 @@ CONFIG_TCM_PSCSI=m
334335
CONFIG_NETDEVICES=y
335336
CONFIG_DUMMY=m
336337
CONFIG_WIREGUARD=m
338+
CONFIG_OVPN=m
337339
CONFIG_EQUALIZER=m
338340
CONFIG_NET_TEAM=m
339341
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -353,6 +355,7 @@ CONFIG_PFCP=m
353355
CONFIG_MACSEC=m
354356
CONFIG_NETCONSOLE=m
355357
CONFIG_NETCONSOLE_DYNAMIC=y
358+
CONFIG_TUN=m
356359
CONFIG_VETH=m
357360
CONFIG_BVME6000_NET=y
358361
CONFIG_PPP=m
@@ -397,8 +400,10 @@ CONFIG_RTC_DRV_GENERIC=m
397400
CONFIG_DAX=m
398401
CONFIG_EXT4_FS=y
399402
CONFIG_JFS_FS=m
403+
CONFIG_XFS_FS=m
400404
CONFIG_OCFS2_FS=m
401405
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
406+
CONFIG_BTRFS_FS=m
402407
CONFIG_BCACHEFS_FS=m
403408
CONFIG_FANOTIFY=y
404409
CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -497,6 +502,7 @@ CONFIG_DLM=m
497502
CONFIG_ENCRYPTED_KEYS=m
498503
CONFIG_HARDENED_USERCOPY=y
499504
CONFIG_CRYPTO_USER=m
505+
CONFIG_CRYPTO_NULL=m
500506
CONFIG_CRYPTO_CRYPTD=m
501507
CONFIG_CRYPTO_BENCHMARK=m
502508
CONFIG_CRYPTO_RSA=m
@@ -529,7 +535,6 @@ CONFIG_CRYPTO_LRW=m
529535
CONFIG_CRYPTO_PCBC=m
530536
CONFIG_CRYPTO_XTS=m
531537
CONFIG_CRYPTO_AEGIS128=m
532-
CONFIG_CRYPTO_CHACHA20POLY1305=m
533538
CONFIG_CRYPTO_MD4=m
534539
CONFIG_CRYPTO_MICHAEL_MIC=m
535540
CONFIG_CRYPTO_RMD160=m
@@ -549,6 +554,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
549554
CONFIG_CRYPTO_USER_API_RNG=m
550555
CONFIG_CRYPTO_USER_API_AEAD=m
551556
# CONFIG_CRYPTO_HW is not set
557+
CONFIG_PRIME_NUMBERS=m
552558
CONFIG_XZ_DEC_TEST=m
553559
CONFIG_GLOB_SELFTEST=m
554560
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -580,6 +586,7 @@ CONFIG_FIND_BIT_BENCHMARK=m
580586
CONFIG_TEST_FIRMWARE=m
581587
CONFIG_TEST_SYSCTL=m
582588
CONFIG_LINEAR_RANGES_TEST=m
589+
CONFIG_CRC_BENCHMARK=y
583590
CONFIG_TEST_UDELAY=m
584591
CONFIG_TEST_STATIC_KEYS=m
585592
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
262262
CONFIG_BRIDGE_EBT_SNAT=m
263263
CONFIG_BRIDGE_EBT_LOG=m
264264
CONFIG_BRIDGE_EBT_NFLOG=m
265+
CONFIG_IP_SCTP=m
265266
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
266267
CONFIG_RDS=m
267268
CONFIG_RDS_TCP=m
@@ -335,6 +336,7 @@ CONFIG_TCM_PSCSI=m
335336
CONFIG_NETDEVICES=y
336337
CONFIG_DUMMY=m
337338
CONFIG_WIREGUARD=m
339+
CONFIG_OVPN=m
338340
CONFIG_EQUALIZER=m
339341
CONFIG_NET_TEAM=m
340342
CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -354,6 +356,7 @@ CONFIG_PFCP=m
354356
CONFIG_MACSEC=m
355357
CONFIG_NETCONSOLE=m
356358
CONFIG_NETCONSOLE_DYNAMIC=y
359+
CONFIG_TUN=m
357360
CONFIG_VETH=m
358361
CONFIG_HPLANCE=y
359362
CONFIG_PPP=m
@@ -407,8 +410,10 @@ CONFIG_RTC_DRV_GENERIC=m
407410
CONFIG_DAX=m
408411
CONFIG_EXT4_FS=y
409412
CONFIG_JFS_FS=m
413+
CONFIG_XFS_FS=m
410414
CONFIG_OCFS2_FS=m
411415
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
416+
CONFIG_BTRFS_FS=m
412417
CONFIG_BCACHEFS_FS=m
413418
CONFIG_FANOTIFY=y
414419
CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -507,6 +512,7 @@ CONFIG_DLM=m
507512
CONFIG_ENCRYPTED_KEYS=m
508513
CONFIG_HARDENED_USERCOPY=y
509514
CONFIG_CRYPTO_USER=m
515+
CONFIG_CRYPTO_NULL=m
510516
CONFIG_CRYPTO_CRYPTD=m
511517
CONFIG_CRYPTO_BENCHMARK=m
512518
CONFIG_CRYPTO_RSA=m
@@ -539,7 +545,6 @@ CONFIG_CRYPTO_LRW=m
539545
CONFIG_CRYPTO_PCBC=m
540546
CONFIG_CRYPTO_XTS=m
541547
CONFIG_CRYPTO_AEGIS128=m
542-
CONFIG_CRYPTO_CHACHA20POLY1305=m
543548
CONFIG_CRYPTO_MD4=m
544549
CONFIG_CRYPTO_MICHAEL_MIC=m
545550
CONFIG_CRYPTO_RMD160=m
@@ -559,6 +564,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
559564
CONFIG_CRYPTO_USER_API_RNG=m
560565
CONFIG_CRYPTO_USER_API_AEAD=m
561566
# CONFIG_CRYPTO_HW is not set
567+
CONFIG_PRIME_NUMBERS=m
562568
CONFIG_XZ_DEC_TEST=m
563569
CONFIG_GLOB_SELFTEST=m
564570
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -590,6 +596,7 @@ CONFIG_FIND_BIT_BENCHMARK=m
590596
CONFIG_TEST_FIRMWARE=m
591597
CONFIG_TEST_SYSCTL=m
592598
CONFIG_LINEAR_RANGES_TEST=m
599+
CONFIG_CRC_BENCHMARK=y
593600
CONFIG_TEST_UDELAY=m
594601
CONFIG_TEST_STATIC_KEYS=m
595602
CONFIG_TEST_KMOD=m

0 commit comments

Comments
 (0)