CVS commit: src/sys/arch/evbarm/fdt

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Dec 18 07:34:31 UTC 2020

Modified Files:
        src/sys/arch/evbarm/fdt: fdt_machdep.c

Log Message:
Make EFI_RUNTIME compile on arm


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbarm/fdt/fdt_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.84 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.85
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.84	Fri Dec 18 07:21:58 2020
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c	Fri Dec 18 07:34:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.84 2020/12/18 07:21:58 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.85 2020/12/18 07:34:31 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.84 2020/12/18 07:21:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.85 2020/12/18 07:34:31 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bootconfig.h"
@@ -474,8 +474,10 @@ fdt_map_efi_runtime(const char *prop, en
 	while (len >= 24) {
 		const paddr_t pa = be64toh(map[0]);
 		const vaddr_t va = be64toh(map[1]);
-		const uint64_t sz = be64toh(map[2]);
-		VPRINTF("%s: %s %lx-%lx (%lx-%lx)\n", __func__, prop, pa, pa+sz-1, va, va+sz-1);
+		const size_t sz = be64toh(map[2]);
+		VPRINTF("%s: %s %" PRIxPADDR "-%" PRIxVADDR "(%" PRIxVADDR
+		    "-%" PRIxVSIZE "\n", __func__, prop, pa, pa + sz - 1,
+		    va, va + sz - 1);
 		arm_efirt_md_map_range(va, pa, sz, type);
 		map += 3;
 		len -= 24;