Date: Sat, 1 May 2021 10:04:59 -0700 From: Mark Millard <marklmi@yahoo.com> To: David Wolfskill <david@catwhisker.org>, freebsd-current <freebsd-current@freebsd.org> Subject: Re: Build fail updating from n246398-388c0cde1029 -> n246413-c78ad207baed Message-ID: <4F8A88D3-76D2-4E1E-A7BF-A917182905D9@yahoo.com> References: <4F8A88D3-76D2-4E1E-A7BF-A917182905D9.ref@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
h= ttps://lists.freebsd.org/pipermail/dev-commits-src-main/2021-May/003953.ht= ml reports for main's commit just after c78ad207baed : The branch main has been updated by andrew: URL:=20 = https://cgit.FreeBSD.org/src/commit/?id=3Df1957db43d28dbae1f82905304bab5be= 51942342 commit f1957db43d28dbae1f82905304bab5be51942342 Author: Andrew Turner <andrew at FreeBSD.org> AuthorDate: 2021-05-01 11:10:03 +0000 Commit: Andrew Turner <andrew at FreeBSD.org> CommitDate: 2021-05-01 11:10:03 +0000 Fix building sysctl(8) after c78ad20 =20 In sysctl we parse an efi header on amd64. Fix this after changing = the virtual memory type from a void * to a uint64_t in c78ad20. --- sbin/sysctl/sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 30d6d94723fa..8d658dc2debe 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -794,8 +794,8 @@ S_efi_map(size_t l2, void *p) type =3D types[map->md_type]; if (type =3D=3D NULL) type =3D "<INVALID>"; - printf("\n%23s %012jx %12p %08jx ", type, - (uintmax_t)map->md_phys, map->md_virt, + printf("\n%23s %012jx %012jx %08jx ", type, + (uintmax_t)map->md_phys, (uintmax_t)map->md_virt, (uintmax_t)map->md_pages); if (map->md_attr & EFI_MD_ATTR_UC) printf("UC "); =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F8A88D3-76D2-4E1E-A7BF-A917182905D9>