Commit 3bb38c52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bc46b7cb c8995932

arch/m68k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ config M68K 
	select HAVE_ASM_MODVERSIONS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED

	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_UID16

	select MMU_GATHER_NO_RANGE if MMU

arch/m68k/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ config BOOTPARAM_STRING 


config EARLY_PRINTK

	bool "Early printk"

	depends on !(SUN3 || M68000 || COLDFIRE)

	depends on MMU_MOTOROLA

	help

	  Write kernel log output directly to a serial port.

	  Where implemented, output goes to the framebuffer as well.

arch/m68k/configs/amiga_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m 
CONFIG_BRIDGE_EBT_SNAT=m

CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m
@@ -356,6 +357,7 @@ CONFIG_TCM_PSCSI=m 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_OVPN=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -375,6 +377,7 @@ CONFIG_PFCP=m 
CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_A2065=y

CONFIG_ARIADNE=y
@@ -448,8 +451,10 @@ CONFIG_RTC_DRV_RP5C01=m 
CONFIG_DAX=m

CONFIG_EXT4_FS=y

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_BTRFS_FS=m

CONFIG_BCACHEFS_FS=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -548,6 +553,7 @@ CONFIG_DLM=m 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_BENCHMARK=m

CONFIG_CRYPTO_RSA=m
@@ -580,7 +586,6 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -600,6 +605,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -631,6 +637,7 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/apollo_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m 
CONFIG_BRIDGE_EBT_SNAT=m

CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m
@@ -336,6 +337,7 @@ CONFIG_TCM_PSCSI=m 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_OVPN=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -355,6 +357,7 @@ CONFIG_PFCP=m 
CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m
@@ -405,8 +408,10 @@ CONFIG_RTC_DRV_GENERIC=m 
CONFIG_DAX=m

CONFIG_EXT4_FS=y

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_BTRFS_FS=m

CONFIG_BCACHEFS_FS=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -505,6 +510,7 @@ CONFIG_DLM=m 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_BENCHMARK=m

CONFIG_CRYPTO_RSA=m
@@ -537,7 +543,6 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -557,6 +562,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -588,6 +594,7 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/atari_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m 
CONFIG_BRIDGE_EBT_SNAT=m

CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m
@@ -351,6 +352,7 @@ CONFIG_TCM_PSCSI=m 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=m

CONFIG_WIREGUARD=m

CONFIG_OVPN=m

CONFIG_EQUALIZER=m

CONFIG_NET_TEAM=m

CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -370,6 +372,7 @@ CONFIG_PFCP=m 
CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m

CONFIG_NETCONSOLE_DYNAMIC=y

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_ATARILANCE=y

CONFIG_NE2000=y
@@ -425,8 +428,10 @@ CONFIG_RTC_DRV_GENERIC=m 
CONFIG_DAX=m

CONFIG_EXT4_FS=y

CONFIG_JFS_FS=m

CONFIG_XFS_FS=m

CONFIG_OCFS2_FS=m

# CONFIG_OCFS2_DEBUG_MASKLOG is not set

CONFIG_BTRFS_FS=m

CONFIG_BCACHEFS_FS=m

CONFIG_FANOTIFY=y

CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -525,6 +530,7 @@ CONFIG_DLM=m 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_HARDENED_USERCOPY=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_BENCHMARK=m

CONFIG_CRYPTO_RSA=m
@@ -557,7 +563,6 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -577,6 +582,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -608,6 +614,7 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m