From nobody Fri Apr 3 07:49:56 2026 X-Original-To: dev-commits-src-main@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 4fn9qS1MLwz6Y9Hq for ; Fri, 03 Apr 2026 07:49:56 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fn9qS0sxsz3lFH for ; Fri, 03 Apr 2026 07:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775202596; 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=iZJDpr3A3l4mw1bcxMDqOp/z09njT4+7IBDvZrbtbbU=; b=yMPdp0bCZ48cI2t1d0ylkrKDK04LvvOjpE/5oqCySNh1oiWutIPORS+tDq6a7lJRpjbIV5 yPfPc51L8OpXRUTnBK0B+4vmoGup/mVimTNaMDEUZv/bfC+EAmB4bI1f5ByTPsuEoPD6jE 8NPC1/aLmN5Y5Lius9jy7zgPcPysKxPQxsxpqKg2d1A748cm4Yf0GFLuA9SbG2p56W0SJa mI7cyqiNw/n3/+tjuB2NRej0mOhhEjEjPKLZWbsp9aZ+Py4ZuYWmio0BEmRuVeOuTaiu9S o9t0Aa4zHJ9RfVxoxpqDIgjBX3VJTJcrjct2S+ho/8b4CMMj4QVrm+yRpaHI2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775202596; a=rsa-sha256; cv=none; b=bHzgxhR8d3+tV1k4bXGVh7S+q5HVsothbDDOXQllV6+n83QtU8v4fqWNYdQ5g+1HtldAfO Iov/SDUeZpASz3Icpbair/+rD5zLyid1bCqxVrvUnWWgqdKIHrkGAkN96++Rw1E8k5rEb2 hib5MjPtL1cG8leTr61cynezFf2hDLdv9hWBf9UXRfI7Ei6VJ0O5vgDzsTTrVz1Jyn4Vf9 2CHDiz7hD9MgRd+J4+HxEX1xqOueOq48zbwOadCakmhPTPrSwWWc/QmcR5VT2CbMyE3ZG1 m3ezjt2pbv/6fyJ7C57QVw5A6f9oNQ03hlPB6k1URoXrccdGkrP1BdiOBeVqsw== 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=1775202596; 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=iZJDpr3A3l4mw1bcxMDqOp/z09njT4+7IBDvZrbtbbU=; b=atYjATIFpw3Kayx0SWz6PvnsoSD3HDLV2gHnsgC1bV7iprD6sjD7YiMA+ZuATqyZq6y4d4 UKdF5KZM2ImPMllApDMA5hRjIif/yyNnEzyuzcu0nw9B1nbNwB1MdbXhBEYd2cnnBdY6mG 2mFgnbJKEcq5I1PauYKJcc59Yr3d8KQDXhVjNeRqbrrH9o6+2phRvzAwsCW5cKkfPH1LCM CSSFZJrsaSMRZSXY26NilVWQSKttmSl6Uk++dPXh1ceZqSwwFK5WnikYwG6eleS3gyX41h s+q82YC+i2wnHcccP6HDxjuKolmD7Tkan+0ykWPZ3PdEmquN1VwBNbIhkvjJ+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fn9qS0DkFzgTB for ; Fri, 03 Apr 2026 07:49:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25779 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Apr 2026 07:49:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: b3d6829f4998 - main - subr_module: account for MODINFOMD_EFI_ARCH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b3d6829f4998ad8ac8c65d39ac9513ba85a9974b Auto-Submitted: auto-generated Date: Fri, 03 Apr 2026 07:49:56 +0000 Message-Id: <69cf7124.25779.dcfdcc@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=b3d6829f4998ad8ac8c65d39ac9513ba85a9974b commit b3d6829f4998ad8ac8c65d39ac9513ba85a9974b Author: Ahmad Khalifa AuthorDate: 2026-04-03 07:13:29 +0000 Commit: Ahmad Khalifa CommitDate: 2026-04-03 07:15:20 +0000 subr_module: account for MODINFOMD_EFI_ARCH Fixes: b538d4911004ca541507166b8ec9689d2e87d1aa MFC after: 2 weeks --- 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: