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

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri May 15 06:01:26 UTC 2020

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

Log Message:
Fix build on arm


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 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.71 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.72
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.71	Thu May 14 19:26:28 2020
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c	Fri May 15 06:01:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.71 2020/05/14 19:26:28 riastradh Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.72 2020/05/15 06:01:26 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.71 2020/05/14 19:26:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.72 2020/05/15 06:01:26 skrll Exp $");
 
 #include "opt_machdep.h"
 #include "opt_bootconfig.h"
@@ -381,12 +381,14 @@ fdt_map_range(uint64_t start, uint64_t e
 	if (*psize == 0)
 		return NULL;
 
+	const vaddr_t voff = start & PAGE_MASK;
+
 	va = uvm_km_alloc(kernel_map, *psize, 0, UVM_KMF_VAONLY|UVM_KMF_NOWAIT);
 	if (va == 0) {
 		printf("Failed to allocate VA for %s\n", purpose);
 		return NULL;
 	}
-	ptr = (void *)(va + (start & (PAGE_SIZE-1)));
+	ptr = (void *)(va + voff);
 
 	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE)
 		pmap_kenter_pa(va, pa, VM_PROT_READ|VM_PROT_WRITE, 0);