From nobody Tue Feb 3 17:20:19 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 4f59Gq4Fy4z6QRyW for ; Tue, 03 Feb 2026 17:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f59Gq3K1Xz3G0Q for ; Tue, 03 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139219; 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=c+VXj7kBSCDP40+utHNby2h2y7XEEsHZWxCr1I3bB6Q=; b=trRNXYZAYXDHl1lZ5KaSUomH7eWJUfq7WxJDFpWZDxlHxMaIiOLZSJ+AGaj1DCSQ77KFa/ vsSeqPYV0GZx7DUCmLvjbsyXW5Zye1bi7yqaoeRagkyySUQnPgyUD3ETJt90Wko8bIXcTA ljrwxpfXfaGwy4iYiWD1Dq4SggU05Btd/YN1KE6u+72aWKptZOAc18XGYnOyuke65l7cxt Xubnlr30XHyUjbGQwcR5+yV5a42iW7e3qwFmunw1dk4MsOEanqCqwc87w9tDGhCZ6NrUp3 iiRdANwXHHC13akyC7hrKoc81As59/TCjbji40RW5fOebb330bGp6qEIUzmK0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139219; a=rsa-sha256; cv=none; b=SgSD74ghMBUivP2EvsR4ooRF7c2UISThjdis9B0JkoZfPzsYG9uLcyo9ihzKnf9t5zGrzL MYS9tLvyoX36UfBFujzKxm3mmsOrwbu0ueKdedARsffb9FWdlyzusMzYvx6kXe7WdfuerI JFk5Nt8Vags7a3+v7bNrkmn4vpspXGMkKQTb2DlLvgE495vj14+4OWV2N+gSChFTcfbW7p epb2nGxyPeduSXWlyNfd0OPHptIjE1UDbijwYsjLkpnbpWxC7BAPfLrG9+nBFFY8185Tdb 4vBpEkmxu7akG3RvG9nINGabFF2hESKrVYE5Kdf/Q7f+Tp1PD4YvsKZqIQvKVA== 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=1770139219; 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=c+VXj7kBSCDP40+utHNby2h2y7XEEsHZWxCr1I3bB6Q=; b=N1IbAvAkjAlP3D+U38eYQ+++BHor25bYcMVDJX06OcGbR6KJXT7H9QTkFdncip6PKZRrDf jjDjE708sa3iNLVLV5jtyauWwC2i80IhAEqzy/O/16312TigjCLf8U5x7ozlrshnRlvFoB 4Mem2O0gfS7tkaP7+VQzKrXXl0epD+vp4FKOIGboKZGrbzU6SVRhnP0HAofiy89Lxvdsz8 NfUI7n/PScLQ8flVsQ/BAtOZPWnI9gruuw8U+rX6Pvljsg8chiG51sI+VhPZg+sYN8uf/Q +IndPUdThempUrPPXSfnZgbz9GqyTWTi57g0qYhrwTIY90OZ/X29U1hWNKTGEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59Gq2nRjz6Vh for ; Tue, 03 Feb 2026 17:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f814 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:20:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 53bb02015fce - main - amd64: parse_memmap(): Move comment about size at proper place 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53bb02015fce72c79498842b898faefc2da3b0fb Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:20:19 +0000 Message-Id: <69822e53.1f814.60543c12@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=53bb02015fce72c79498842b898faefc2da3b0fb commit 53bb02015fce72c79498842b898faefc2da3b0fb Author: Olivier Certner AuthorDate: 2026-01-30 17:33:12 +0000 Commit: Olivier Certner CommitDate: 2026-02-03 17:19: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 --- 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 e56de986ccba..ae5df475f046 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -827,15 +827,6 @@ native_parse_memmap(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(preload_kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); @@ -848,7 +839,15 @@ native_parse_memmap(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)); }