From nobody Mon Jun 12 14:57:53 2023 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 4Qfvtp1RPRz4cYV7; Mon, 12 Jun 2023 14:57:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qfvtp11gMz4N6V; Mon, 12 Jun 2023 14:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686581874; 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=bcK9PicuEnPnrTGq9CQMyuKH9t/7+d40bAl4WfCeX98=; b=T1FEEM2DP9lY1X4lYzxLkI7FZkVJAp6NHJE/jqDpI7rSiWT80Pg7tkdhwLC5pOtpJ0L/GA 8WhkwBD/C/RF9lwCBXeznNsWDDcoXKJ1pg2Iy9ORa29p2ewDfV8/Q3Nuol4lBfE828XpsE gdxA52v/NeSGXkHRA3IhuuhDYyQ3G6/xDR682ppSV3y0zyXQg+578y13j2JzturIB4vaPX Cqk5QX7oa/qmQi/pv89IfSxSPq+XY0QG7Eg6msfByLd1PKrkF/U43zF/N6PiJm4U/K2KT3 5kF0yI1/YA5OwyxmvbtGdfxyXxrqtnNCfomKkoX5+P6vPH0yTBnvPg2ocuf0sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686581874; 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=bcK9PicuEnPnrTGq9CQMyuKH9t/7+d40bAl4WfCeX98=; b=xVw7uYnj/8ksvo1QdXcBA1iAnuAJa5/8KCXMnpjilsfyhqHZ9+gZoxus+PYrn+C6Ub594T OKHBjZC3yHZEh9j5YQUrmkVXLwU7uxsHKrpJIaxZYGPbriBgermSzCb0Z0LorMF4wUnldA v8D5TrejE5KUnBA8t8n35DoJonYV7lS2zMX3F51CLsdGHRlWNc0YRJ9K2X3mTbQF7Sf8TN qzLbJbCmhV4bbAvdm9ZD7W1lVWKMtaG6w9GV3L7DDufeptTY347lXHRlQRht22sa2y53VQ Jh4ksot13h6t3+c1aMqwhKOe2Ch5tLqO72fA/eUWn8aP+AR6DufZZYOesWaoXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686581874; a=rsa-sha256; cv=none; b=xC++9xJ7b87D7nfgfWqJMQHuaqIAUESJxlpwFZQe5H1V9ulJjs+7KcWGsjB74O+7jwTdEc aye+nBioWBVwg7SFeH5T3Cz+Uc6zys7hGxXzj8D3yvnwF2QC9qPp6Kkx7gtphc93mGQ8Sx zgYTXn4PYBSFr7mCJEKAxUdpT/WSWekGIBqOC9g2ehxbqKJgCfWNLgp+Gat7qTF8nU00ky aYttb3sA/I3SypIPtq6IjCeqiVhGqWUDAahnm+dxhv9M07WpJJNrwObPhKi9tGuqVS03NJ rbyoI06u2U1GDbsHWCt2/RqXppyKb8gS6CoXgzBhXY+DyxLjxOxD93v90ULMtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qfvtp06mDzkpM; Mon, 12 Jun 2023 14:57:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CEvrHA095935; Mon, 12 Jun 2023 14:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CEvrfu095934; Mon, 12 Jun 2023 14:57:53 GMT (envelope-from git) Date: Mon, 12 Jun 2023 14:57:53 GMT Message-Id: <202306121457.35CEvrfu095934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6f6213ec90e1 - main - Add comments for memory size 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f6213ec90e1b5c488cde38f86b4eef09c70c00c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6213ec90e1b5c488cde38f86b4eef09c70c00c commit 6f6213ec90e1b5c488cde38f86b4eef09c70c00c Author: VexedUXR <58701572+VexedUXR@users.noreply.github.com> AuthorDate: 2023-06-12 14:57:02 +0000 Commit: Warner Losh CommitDate: 2023-06-12 14:57:20 +0000 Add comments for memory size Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/753 --- stand/efi/loader/arch/amd64/elf64_freebsd.c | 2 +- stand/kboot/arch/amd64/elf64_freebsd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c index 290d1c4696da..0ed9d2d78ffd 100644 --- a/stand/efi/loader/arch/amd64/elf64_freebsd.c +++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c @@ -169,7 +169,7 @@ elf64_exec(struct preloaded_file *fp) trampoline = (void *)trampcode; if (copy_staging == COPY_STAGING_ENABLE) { - PT4 = (pml4_entry_t *)0x0000000040000000; + PT4 = (pml4_entry_t *)0x0000000040000000; /* 1G */ err = BS->AllocatePages(AllocateMaxAddress, EfiLoaderData, 3, (EFI_PHYSICAL_ADDRESS *)&PT4); if (EFI_ERROR(err)) { diff --git a/stand/kboot/arch/amd64/elf64_freebsd.c b/stand/kboot/arch/amd64/elf64_freebsd.c index c3ed842a2abd..c25a22f504f8 100644 --- a/stand/kboot/arch/amd64/elf64_freebsd.c +++ b/stand/kboot/arch/amd64/elf64_freebsd.c @@ -238,7 +238,7 @@ elf64_exec(struct preloaded_file *fp) #ifdef EFI if (copy_staging == COPY_STAGING_ENABLE) { - PT4 = (pml4_entry_t *)0x0000000040000000; + PT4 = (pml4_entry_t *)0x0000000040000000; /* 1G */ err = BS->AllocatePages(AllocateMaxAddress, EfiLoaderData, 3, (EFI_PHYSICAL_ADDRESS *)&PT4); if (EFI_ERROR(err)) {