Module Name: src Committed By: rin Date: Fri Apr 29 20:24:02 UTC 2022
Modified Files: src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c Log Message: Fix fallout from libsa change; stand.h includes <sys/param.h> now. - Stop redefining roundup2(). - Compare kvamap->start (uint64_t) with 0 instead of NULL. - Include <sys/param.h> explicitly. Thanks gson@ for notification. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/sys/arch/sparc/stand/ofwboot/loadfile_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/sparc/stand/ofwboot/loadfile_machdep.c diff -u src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.16 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.17 --- src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.16 Fri Nov 4 20:04:11 2016 +++ src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c Fri Apr 29 20:24:02 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.c,v 1.16 2016/11/04 20:04:11 macallan Exp $ */ +/* $NetBSD: loadfile_machdep.c,v 1.17 2022/04/29 20:24:02 rin Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,6 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/param.h> + #include <lib/libsa/stand.h> #include <lib/libkern/libkern.h> @@ -47,8 +49,6 @@ #define hi(val) ((uint32_t)(((val) >> 32) & (uint32_t)-1)) #define lo(val) ((uint32_t)((val) & (uint32_t)-1)) -#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) - typedef int phandle_t; @@ -133,7 +133,7 @@ kvamap_extract(vaddr_t va, vsize_t len, *new_va = va; for (i = 0; (len > 0) && (i < MAXSEGNUM); i++) { - if (kvamap[i].start == NULL) + if (kvamap[i].start == 0) break; if ((kvamap[i].start <= va) && (va < kvamap[i].end)) { uint64_t va_len = kvamap[i].end - va; @@ -155,7 +155,7 @@ kvamap_enter(uint64_t va, uint64_t len) DPRINTF(("kvamap_enter: %d@%p\n", (int)len, (void*)(u_long)va)); for (i = 0; (len > 0) && (i < MAXSEGNUM); i++) { - if (kvamap[i].start == NULL) { + if (kvamap[i].start == 0) { kvamap[i].start = va; kvamap[i].end = va + len; break;