Date: Sat, 1 May 2021 13:36:50 GMT From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f1957db43d28 - main - Fix building sysctl(8) after c78ad20 Message-ID: <202105011336.141DaoZ8080998@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f1957db43d28dbae1f82905304bab5be51942342 commit f1957db43d28dbae1f82905304bab5be51942342 Author: Andrew Turner <andrew@FreeBSD.org> AuthorDate: 2021-05-01 11:10:03 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> CommitDate: 2021-05-01 11:10:03 +0000 Fix building sysctl(8) after c78ad20 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 = types[map->md_type]; if (type == NULL) type = "<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 ");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105011336.141DaoZ8080998>