Re: Build fail updating from n246398-388c0cde1029 -> n246413-c78ad207baed

From: Mark Millard <marklmi_at_yahoo.com>
Date: Sat, 1 May 2021 10:04:59 -0700
https://lists.freebsd.org/pipermail/dev-commits-src-main/2021-May/003953.html

reports for main's commit just after c78ad207baed :

The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f1957db43d28dbae1f82905304bab5be51942342


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
    
    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
_at__at_ -794,8 +794,8 _at__at_ 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 ");

===
Mark Millard
marklmi at yahoo.com
( dsl-only.net went
away in early 2018-Mar)
Received on Sat May 01 2021 - 15:05:10 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:28 UTC