From nobody Thu May 1 22:02:00 2025 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 4ZpSh84nL6z5vnTC; Thu, 01 May 2025 22:02:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpSh814Rrz40px; Thu, 01 May 2025 22:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746136920; 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=lcprIR9mR+alQHWxjBLH2dqdzqvbCvIWxA23gIQE6Ag=; b=va5NWxYW6V/xWHgAznyeX1hFfAnpTX03btArpfLVz1BR9B8eIJdnTv838evy6+JGRMYSbC ON2E2WLQi10H/YD7Nd/Vg1MOJE8SY6pCHJ0mOW//hXitRTemf3MnmclE/dJrxa9BOukE6I hOiA1vMObz9YuV8fOWhS9mj5tbMd1TL1Z+CYlFMIlbVP0pP3kgsV8XylIsVrtDdiPsw3aR IbHcl7WgZHbaHUYMcw9+8/S7Gd6UU1pPhXu7p+DUO2KLfIl8aOCs1L3YIupta28X97efge aqvCr6D+iSvRMZVBEFixqkqcQFqY8SVMxr9uB6JdWEBV/ncOr2WNAwSGode0+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746136920; 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=lcprIR9mR+alQHWxjBLH2dqdzqvbCvIWxA23gIQE6Ag=; b=YVQuErjbO64EcGQxPtb2bHNRGgnOwTpnTGHvC//G5pOOqXm4YVzkCNJ+oJK2zb2IPqkZaf i3+O9fHq5+qhsijQIqfUmCZgR/3MdmV301eBylJd5LyBspPD+j0KLOV5Em5VdJ6l7NNB3T lskuZtMbbMp5n9HV3Ne2bISh0wG0cOAiS6+wnN3IJDZ7TlnfH3DlCKhdOu024rjEBoh/zV pphYXUTdERJ5jBEAtqcOW69/ooIB1f1FJcyb+ifBh5wW1SO4yML/NPpma46AzNtBHFcJ8g /65JvrHnIv7iFk2fmbcugAb3BDC2NAv7ponS1h+EHO1GOLBeeaiN01FirU6gjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746136920; a=rsa-sha256; cv=none; b=ie87bVyHbpM3SAKyxdPuQ+UHbHfGpAf/svTu96pjxvMZJQxkDUMTSsSV08m7rM2ngie75f sRIqsbUEIiiL2OZM70XYqrMA5YPaJs6/kE6xbXRAagi+kylSqyTYgWME/aYohaQCZI7wB1 7IWqjM2Ri9pQ5S6LRh8/bOApNwLDO2n6ETeKGkJx6LIRCg2F/twN1XVTuaPoUNCXAf4VQt H3EBA2ZnfyqEl7PT7a9wET/7yHVUIhgw94tItkpn+eyXNeLnO5hA/z4mkwHHR/jMCps/In p3nW6SzC5n7M+4HIItmCuXmuZgMfcSK5jYQPsCbI5SQW+ERkbHQCLG3+AQv8Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpSh80YhFzmGg; Thu, 01 May 2025 22:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 541M20HZ015093; Thu, 1 May 2025 22:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541M20Zs015090; Thu, 1 May 2025 22:02:00 GMT (envelope-from git) Date: Thu, 1 May 2025 22:02:00 GMT Message-Id: <202505012202.541M20Zs015090@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: 7bea3c7c1cb2 - main - efi: Fix overlooked uuid -> efi_guid_t change 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bea3c7c1cb2c3aca92e90ac1bf5af2743ce5937 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7bea3c7c1cb2c3aca92e90ac1bf5af2743ce5937 commit 7bea3c7c1cb2c3aca92e90ac1bf5af2743ce5937 Author: Warner Losh AuthorDate: 2025-05-01 21:59:43 +0000 Commit: Warner Losh CommitDate: 2025-05-01 21:59:43 +0000 efi: Fix overlooked uuid -> efi_guid_t change This was overlook we switched to using efi_guid_t. Fixes: 6366114c716f9 Sponsored by: Netflix --- sys/arm64/arm64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index ca393e11cef9..9c7d7892aa10 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -513,7 +513,7 @@ static void exclude_efi_memreserve(vm_paddr_t efi_systbl_phys) { struct efi_systbl *systbl; - struct uuid efi_memreserve = LINUX_EFI_MEMRESERVE_TABLE; + efi_guid_t efi_memreserve = LINUX_EFI_MEMRESERVE_TABLE; systbl = (struct efi_systbl *)PHYS_TO_DMAP(efi_systbl_phys); if (systbl == NULL) { @@ -542,7 +542,7 @@ exclude_efi_memreserve(vm_paddr_t efi_systbl_phys) cfgtbl = efi_early_map(systbl->st_cfgtbl + i * sizeof(*cfgtbl)); if (cfgtbl == NULL) panic("Can't map the config table entry %d\n", i); - if (memcmp(&cfgtbl->ct_uuid, &efi_memreserve, sizeof(struct uuid)) != 0) + if (memcmp(&cfgtbl->ct_guid, &efi_memreserve, sizeof(efi_guid_t)) != 0) continue; /*