[src/trunk]: src/sys/uvm Suppress GCC warnings and fix a UVMHIST_LOG() statem...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce61e8b86580
branches:  trunk
changeset: 933163:ce61e8b86580
user:      hannken <hannken%NetBSD.org@localhost>
date:      Wed May 20 12:47:36 2020 +0000

description:
Suppress GCC warnings and fix a UVMHIST_LOG() statement.

Kernels ALL/amd64 and ALL/i386 and port sparc64 build again.

diffstat:

 sys/uvm/uvm_aobj.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 699d66b36d06 -r ce61e8b86580 sys/uvm/uvm_aobj.c
--- a/sys/uvm/uvm_aobj.c        Wed May 20 09:18:25 2020 +0000
+++ b/sys/uvm/uvm_aobj.c        Wed May 20 12:47:36 2020 +0000
@@ -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 @@
 {
        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 @@
                 * 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;
        }