Date: Thu, 1 May 2025 22:02:00 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 7bea3c7c1cb2 - main - efi: Fix overlooked uuid -> efi_guid_t change Message-ID: <202505012202.541M20Zs015090@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7bea3c7c1cb2c3aca92e90ac1bf5af2743ce5937 commit 7bea3c7c1cb2c3aca92e90ac1bf5af2743ce5937 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-05-01 21:59:43 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505012202.541M20Zs015090>