From nobody Thu Jul 23 10:00:28 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 4h5RSr5K9Pz6lVyW for ; Thu, 23 Jul 2026 10:00:28 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RSr2RX8z3Vht for ; Thu, 23 Jul 2026 10:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800828; 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=lzkQJ2WRq0Bhs9m0m1l6ZyklLiPw72uLzG9Sna/8PyI=; b=gHmAKpWUKE8JGvpIF8R5dTsWUJ1IrlS/OVq5S9aA339FkmbeNb6G1b2iTlZ89Y5l4vTZgV lRzQ1c2OnMh4+/sj48wr3Tx1kJuvOTWBdHPO/rx97egoHxh4b3JZe+XOkJ+ndLtahWu1gQ hvHAqngS+OJvX73RtdCSx9rvmPWvDP+8TpsBczRHaF6esB4vHs0KlOqgFR+T6j3FxqfNz9 N6uFGDpyEoGWTaLXGi3qkCWC9yoG9eTeeEaX4VpEJU33YJk3Jd4y7ua2+B1b0sAKzaWWBH xC0cQW7buIj1XXFXIWAXPQz/viO81iHW0naFfqxYjSD21pOCBkNaJT+6eUEfKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800828; a=rsa-sha256; cv=none; b=DSeoVTSvxBgjddIrSUTTqfdLVHb5MLSI6oEHKAp5bOxAFtHWhe77bxe30cNiwNLWi1+L3r 9R3BKOZSC+2bqIevn1XGSF62q6A3gVQCUJuomjDCZf9vNnj7WgrXwEpdnaXG0B9O1gQraR XEajBVhWvcviZmEiaTcR/h4dS+l/9zKPltWTdnnzl5DqkpQW494FM1mLWEanDuz7TZhm3M ViSRXLcbHuECqlV12z79Yex2DrMwOChynjXukqa2yLAWpB2MRR+U86jbTwk3Hyt744abcX tVbkPHv86S+qMisuAPdaT2wXCU/2EsS7FI3PRGNtLiNsQhvNmhhXqNi1E9GT+A== 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=1784800828; 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=lzkQJ2WRq0Bhs9m0m1l6ZyklLiPw72uLzG9Sna/8PyI=; b=CUozKGcIKJz3FtaaD++FgCyNZN/PwKauNcVSjCWxETITCGEcZ9hbcbSjTbsBe4viAZkUzH s2icDpSZnKzmwyiRS1RvvNYMMl4RUyD0LlHykyw5rAbA5pM+974kEsA1zhrp/CuJi7iJ6N vt8NuWy+8O3tj2WQcyJ/FQ8v49Vc5g/4Y0OXKM17JQPC0r7dD7H/DFAmk5nOdvmjxhFcG5 JpmpSY32eK7gutwUCNV3k8kHGo7J+5trqoTJv4ZIqb0HNx7hbu3o5E9svnZgiZ3jPQIat0 rneUoku7I7OqmqIy7ic+/TRa67iL4L2cYGcpM20PyD+Y/Xt4aMDQ7kCqTJnVjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RSr1312z10j7 for ; Thu, 23 Jul 2026 10:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cab5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: fbe6a98490f9 - stable/14 - amd64: parse_memmap(): Move comment about size at proper place 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fbe6a98490f9ef58cdb13f8cabc3177f9757842d Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:28 +0000 Message-Id: <6a61e63c.3cab5.6bf33b7d@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fbe6a98490f9ef58cdb13f8cabc3177f9757842d commit fbe6a98490f9ef58cdb13f8cabc3177f9757842d Author: Olivier Certner AuthorDate: 2026-01-30 17:33:12 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:59:00 +0000 amd64: parse_memmap(): Move comment about size at proper place While here, declare 'size' only in the relevant block. No functional change (intended). MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 53bb02015fce72c79498842b898faefc2da3b0fb) --- sys/amd64/amd64/machdep.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e4761a2e8579..66b36ee7ca12 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -819,15 +819,6 @@ native_parse_memmap(caddr_t kmdp, vm_paddr_t *physmap, int *physmap_idx) { struct bios_smap *smap; struct efi_map_header *efihdr; - u_int32_t size; - - /* - * Memory map from INT 15:E820. - * - * subr_module.c says: - * "Consumer may safely assume that size value precedes data." - * ie: an int32_t immediately precedes smap. - */ efihdr = (struct efi_map_header *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); @@ -840,7 +831,15 @@ native_parse_memmap(caddr_t kmdp, vm_paddr_t *physmap, int *physmap_idx) add_efi_map_entries(efihdr, physmap, physmap_idx); strlcpy(bootmethod, "UEFI", sizeof(bootmethod)); } else { - size = *((u_int32_t *)smap - 1); + /* + * Memory map from INT 15:E820. + * + * subr_module.c says: + * "Consumer may safely assume that size value precedes data." + * ie: an int32_t immediately precedes smap. + */ + u_int32_t size = *((u_int32_t *)smap - 1); + bios_add_smap_entries(smap, size, physmap, physmap_idx); strlcpy(bootmethod, "BIOS", sizeof(bootmethod)); }