From nobody Sat Apr 18 12:12:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fyVxP4L8Dz6ZcqG for ; Sat, 18 Apr 2026 12:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyVxN5ZKzz4Lxk for ; Sat, 18 Apr 2026 12:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8RMoL4OCfIjGPO9PBw4MxSBKljANkYUBebPbTRrkIQ=; b=YGlTP7iV5/jRkhcw+owC4XDmVQdURMQ8LdMNqJLJxKrDKd4zFSPG1lXTZroPnWbYSzWbFR O7Nk9jAT2Toldo77OPqf0OS36xsfkopTtMVf43W/zaaVdbrB4zo4WasoIuzbXGszpg9e+n UY5HlNvu3pSdCPBFARpBuJbtatecyB8y4pH2UvVN5IL8/epNsFL/E+HV9ilbGc6nIB2COt DXQ7I+iVu2bgaK17GCYuto8ykhD6gNrbAsyj0eatquyo3ZFKjXky/LNgyj+anitwE+bO+R ELMFWvqtTi9F2z4SYebTIa5upF9QyE7eK5/T+onxAknPHgAvyg226y8JyoOyzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776514344; a=rsa-sha256; cv=none; b=YK/ZYOhFhufgAVD8sS/oykx8IzhzKFgmovgZcIT+cQdzRL/eOlQFw63quV/uhSv2FRqXpX JYqZif3DGi/c+kj0nCqCI2tHT7bsXSy72ppwafQV/PI3tnGqG597HFOQoRaQCNZJ/eOvTG 0IA5DA2MnP/yR8+dXEFPLBE90eUrM5tLk8QZAGYISsS9FeDRfhy8wZnc4+2uGIr87ztlRK 0umXl+sWEWyjwc8taPVI//9Mj06Mq0/ymtdf1JjFGghVptYaJVuv9P2trzbVsefLhEcHPF 66ps26fNb7UrMray3qDaSEI8e/Gq5sohE0mN9ZwSa6FZcGht7G5c0fldPOlq7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y8RMoL4OCfIjGPO9PBw4MxSBKljANkYUBebPbTRrkIQ=; b=HDGAUjy/SS07geseJkjdxZPmZrsXwuW0CM5ZGgTwThOPGkrNtueP1hTm9V3PqPfrJJEMfz C4cu+rTJZ3uLmXzamXTOt0NdmLQYANaA10N1itod/wxmyfr67ALAW3f5WanqBK1VVIDX4Q +0Djkl4cb7/d8G6Fsxg9BnS79+5nnx2rPJF4KrIUBl7QbeoroHNAv3ULFM+Zrg5qL5BsCQ QB3W4pbPgFFGCAb5EzZ3D8HyGIASoFiktySNqs9JR5DMDByVFjQU6W3gf080KQZqkW/Av1 2nzXPydSpVFUh4HlwRVz6Cz9Y5YoTfm/E/EIjYEiq8lyZLhA58scKb5Z0iLR3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyVxN58zHzgcj for ; Sat, 18 Apr 2026 12:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d95c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 12:12:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 89d68ee568eb - stable/15 - subr_module: account for MODINFOMD_EFI_ARCH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 89d68ee568ebd900fa6561a9ceaf1047f8950e57 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 12:12:19 +0000 Message-Id: <69e37523.3d95c.225c02d3@gitrepo.freebsd.org> The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=89d68ee568ebd900fa6561a9ceaf1047f8950e57 commit 89d68ee568ebd900fa6561a9ceaf1047f8950e57 Author: Ahmad Khalifa AuthorDate: 2026-04-03 07:13:29 +0000 Commit: Ahmad Khalifa CommitDate: 2026-04-18 11:27:26 +0000 subr_module: account for MODINFOMD_EFI_ARCH Fixes: b538d4911004ca541507166b8ec9689d2e87d1aa MFC after: 2 weeks (cherry picked from commit b3d6829f4998ad8ac8c65d39ac9513ba85a9974b) --- sys/kern/subr_module.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c index f8b6770e3189..ab1eefab30b1 100644 --- a/sys/kern/subr_module.c +++ b/sys/kern/subr_module.c @@ -443,6 +443,11 @@ preload_modinfo_type(struct sbuf *sbp, int type) case MODINFOMD_BOOT_HARTID: sbuf_cat(sbp, "MODINFOMD_BOOT_HARTID"); break; +#endif +#ifdef MODINFOMD_EFI_ARCH + case MODINFOMD_EFI_ARCH: + sbuf_cat(sbp, "MODINFOMD_EFI_ARCH"); + break; #endif default: sbuf_cat(sbp, "unrecognized metadata type"); @@ -465,6 +470,9 @@ preload_modinfo_value(struct sbuf *sbp, uint32_t *bptr, int type, int len) case MODINFO_NAME: case MODINFO_TYPE: case MODINFO_ARGS: +#ifdef MODINFOMD_EFI_ARCH + case MODINFO_METADATA | MODINFOMD_EFI_ARCH: +#endif sbuf_printf(sbp, "%s", (char *)bptr); break; case MODINFO_SIZE: