Module Name: src
Committed By: hannken
Date: Wed May 20 12:47:36 UTC 2020
Modified Files:
src/sys/uvm: uvm_aobj.c
Log Message:
Suppress GCC warnings and fix a UVMHIST_LOG() statement.
Kernels ALL/amd64 and ALL/i386 and port sparc64 build again.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/uvm/uvm_aobj.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/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.142 src/sys/uvm/uvm_aobj.c:1.143
--- src/sys/uvm/uvm_aobj.c:1.142 Tue May 19 22:22:15 2020
+++ src/sys/uvm/uvm_aobj.c Wed May 20 12:47:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.142 2020/05/19 22:22:15 ad Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.143 2020/05/20 12:47:36 hannken Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.142 2020/05/19 22:22:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.143 2020/05/20 12:47:36 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
@@ -802,7 +802,7 @@ uao_get(struct uvm_object *uobj, voff_t
{
voff_t current_offset;
struct vm_page *ptmp = NULL; /* Quell compiler warning */
- int lcv, gotpages, maxpages, swslot, pageidx;
+ int lcv, gotpages, maxpages, swslot = -1, pageidx = -1; /* XXX: gcc */
UVMHIST_FUNC("uao_get"); UVMHIST_CALLED(pdhist);
UVMHIST_LOG(pdhist, "aobj=%#jx offset=%jd, flags=%jd",
@@ -876,7 +876,8 @@ uao_get(struct uvm_object *uobj, voff_t
* to unlock and do some waiting or I/O.
*/
- UVMHIST_LOG(pdhist, "<- done (done=%jd)", done, 0,0,0);
+ UVMHIST_LOG(pdhist, "<- done (done=%jd)",
+ (pps[centeridx] != NULL), 0,0,0);
*npagesp = gotpages;
return pps[centeridx] != NULL ? 0 : EBUSY;
}
