From nobody Thu Feb 19 12:29:32 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 4fGt3x1P45z6QRNj for ; Thu, 19 Feb 2026 12:29:33 +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 4fGt3x0BSgz3T40 for ; Thu, 19 Feb 2026 12:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771504173; 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=zCXPf/1RneENWhOClMjuUr6HJl3rhbmC/naZroUBrkE=; b=vnPsctFn2HUbzlNnmXtbXSpvgIAKgPg/xDnpf0YmU4JoIsMhYp+h5t+Vaqld1avktOODnV hQ1CPODf1SrwkPVnHMxadxMQiFCiEWGWk8QI7bW3BpUH1Z4bOLnqroKfHKDKyTCCHnLIoF gEodtHQTrzj42Cac26NnhhkvG2P78k89jReVAoHsZIR3ThcaajZKA783CgjG86O6ZHLcwf etintPB/QIxAy+Ta06SZXScyHoT7j0he66JNLnjJRCunu6D4D2tH56DaXNdUu/n8Mp+c2Q v0v3gQB0bNuGWZHAm/wn3hcZ2dTIpUETRNiSm9lRG1b8OlAMpy4M6wQIEMG7Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771504173; a=rsa-sha256; cv=none; b=kHpohtr8WntCx4F8UYVGRB9IBrz6JEAE5u9jNgnmAI956k04DsOX5+JsQCx4UXIWtHrHP2 Grccoq0CzYxuZUvAdpnaOshlymgvN7btCbO5u66xO41wuyqaZmT6wXdzSwVWiOHAFKleh1 g8ub9j/TNEYbmwF/ju0DwHC7+MgSxxAXlBLjB6JSAb4kb78du+ZTSsFhyuvga1S9Buy+b1 YVk3E0ZvQIz+bHsqOG0ihX689yTzH84m8laveKcfzZG71RQQ3lhPA9luJbKISTRId2YOOd toh+1wsQ3QZ05BZDHUAcSzx41hDHBmQuyp4OlVI6MyxHNv7DEPG8s1bjqI2fIQ== 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=1771504173; 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=zCXPf/1RneENWhOClMjuUr6HJl3rhbmC/naZroUBrkE=; b=tqJbxk3pldK0g2epNYdzvr3CaX+GD3h6KlxMkzQezaVMunls3HwOqeNVJKylVIt/IHEUdV bqXgXAQdR1RQyPqszip+4g7o3nZcHWixTnysmcHT95Z+XjTTgfV0YxvvOcvyd9FQBc3Dfk lhWIrA7yAEWzHMgC8FdZggVczbatcVdn4WTKqGbR5s7d7gmniPjOf8fGcBt4wAONFTzJkh r4JSdWWtaBZ77g8SwemoxsTvfVFyEUgYceiFOFZFkaPtO5g0guqPmCf3+6FPejZqYi80tf o4ct4izc+fue3EoSR4Vnb4auTrr+X/M1gzf1Q4apSQQzfuAyGi5v6UQQbfrPlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGt3w6rr6zj79 for ; Thu, 19 Feb 2026 12:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a600 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 12:29:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 6bc5a7cd9c4e - stable/15 - 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 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/15 X-Git-Reftype: branch X-Git-Commit: 6bc5a7cd9c4e6b54c6329b9358874d5276cadf41 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 12:29:32 +0000 Message-Id: <6997022c.3a600.ab726be@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6bc5a7cd9c4e6b54c6329b9358874d5276cadf41 commit 6bc5a7cd9c4e6b54c6329b9358874d5276cadf41 Author: Olivier Certner AuthorDate: 2026-01-30 17:33:12 +0000 Commit: Olivier Certner CommitDate: 2026-02-19 12:28:51 +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 20d221279bd3..2af7f1151208 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -828,15 +828,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); @@ -849,7 +840,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)); }