From nobody Sat Apr 18 12:12:19 2026 X-Original-To: dev-commits-src-branches@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 4fyVxH4YhBz6Zcq9 for ; Sat, 18 Apr 2026 12:12:19 +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 4fyVxH3ZQRz4Lf7 for ; Sat, 18 Apr 2026 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776514339; 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=jYUm1f1M84/Wimo4OBr7e68S2HGUv9vglgSuBV/5T7FmHNybQ3LcQja5wQ6kpiMTVodmkl 5jwu69G/+Ozq93HbTwwyxKGRDZq1wKb2/Svz+D7B3fps3uJKnV7hU1AtQt3Y7W3/sHL9QC 3KmY/L2mXvujvQT8mcklv8vlgALD00eHsJFMsvK4IQfg1vdhHwaqrKT/i7K1rjPnoidKsL Vir/Us+rhFn8xUq3wFdqdNvXl1R+4pFddZSO8059IuXZ9UBZf8o6LgrpP0gdlJ6aORzwDX PKnhb3kggYNUeiOPJTkXIUgDkYoTw/jR/gS3zeIUvKlxJR8opxbXN8yFZ0Nu7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776514339; a=rsa-sha256; cv=none; b=SLB0dslANvh5Kwt+rg420jDbyv3bmOLdv4P00LJ4tuTCIoYylu4t7ABCYyA1YFRuprE81/ z3DTgpaTln+uzFpbtSCOzQ86S/rpfb+4BrKn2kBb3H3/NRpFsQLq1z4QZX1VpkmbpbgH8c qgcwn8ouOIBBz1t7Zu1rO+BL8hfN49Vl/4hGLLlSlE1k3abXO8lg4arR10Vg/OEE9uDP29 lfPQb0Bt037UW+kS531EjyiJ6ZYnxcOOJW/dZPPOICcTBchrWakk+d+7mrTnt312pG/CnT BHwyKVT2V6pYL/NiQmZmF3RrxrC4rOyWXLVwUWz8hXqdB/cgm+I/soxVtsP7cg== 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=1776514339; 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=tcQQERUwMwE/XXJdT75FWU90zmzzxIAgbjZZa7UJhzE9Koag3skSkp9IL4VnPPtW+HU+va qofYbajERJeacmARZ3MUuF5dvrrW7MJrr2UV4V2dLqsMP9IYRxjMfJFwBIpidUnjslIkyl OVAYtw0JMKMctKaxTgIwoH8ysqqsMDeVAvg9oywXdZDebFOcV1HfA5AVGAtC0tahVbyHoD oHu33izAQHLIDDuq63Gcq2W/L/Ui7dIsm0WQK2ndGfS3Fkvfk/gNLMCOpB7I05lD1+VeD0 1fRTSHOzUvPjzrS1Fu4xbkC3kva3EKkOxFirJ40GVpSqGKHYGD4kMij7eynx4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyVxH32hnzg5M for ; Sat, 18 Apr 2026 12:12:19 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: