[src/trunk]: src/sys/uvm __diagused police

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

details:   https://anonhg.NetBSD.org/src/rev/14828683e047
branches:  trunk
changeset: 352174:14828683e047
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Mar 19 23:44:34 2017 +0000

description:
__diagused police

diffstat:

 sys/uvm/uvm_fault.c |  8 +++-----
 sys/uvm/uvm_km.c    |  8 +++-----
 sys/uvm/uvm_loan.c  |  8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diffs (87 lines):

diff -r f8bd71c32da2 -r 14828683e047 sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Sun Mar 19 23:30:39 2017 +0000
+++ b/sys/uvm/uvm_fault.c       Sun Mar 19 23:44:34 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.197 2015/06/22 06:24:17 matt Exp $     */
+/*     $NetBSD: uvm_fault.c,v 1.198 2017/03/19 23:44:34 riastradh Exp $        */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.197 2015/06/22 06:24:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.198 2017/03/19 23:44:34 riastradh Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1602,9 +1602,7 @@
        struct uvm_faultinfo *ufi, struct uvm_faultctx *flt,
        struct vm_page **pages)
 {
-#ifdef DIAGNOSTIC
-       struct vm_amap *amap = ufi->entry->aref.ar_amap;
-#endif
+       struct vm_amap *amap __diagused = ufi->entry->aref.ar_amap;
        struct uvm_object *uobj = ufi->entry->object.uvm_obj;
        struct vm_page *uobjpage;
        int error;
diff -r f8bd71c32da2 -r 14828683e047 sys/uvm/uvm_km.c
--- a/sys/uvm/uvm_km.c  Sun Mar 19 23:30:39 2017 +0000
+++ b/sys/uvm/uvm_km.c  Sun Mar 19 23:44:34 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_km.c,v 1.141 2016/07/27 16:45:00 maxv Exp $        */
+/*     $NetBSD: uvm_km.c,v 1.142 2017/03/19 23:44:34 riastradh Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.141 2016/07/27 16:45:00 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.142 2017/03/19 23:44:34 riastradh Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -816,9 +816,7 @@
        loopsize = size;
 
        while (loopsize) {
-#ifdef DIAGNOSTIC
-               paddr_t pa;
-#endif
+               paddr_t pa __diagused;
                KASSERTMSG(!pmap_extract(pmap_kernel(), loopva, &pa),
                    "loopva=%#"PRIxVADDR" loopsize=%#"PRIxVSIZE
                    " pa=%#"PRIxPADDR" vmem=%p",
diff -r f8bd71c32da2 -r 14828683e047 sys/uvm/uvm_loan.c
--- a/sys/uvm/uvm_loan.c        Sun Mar 19 23:30:39 2017 +0000
+++ b/sys/uvm/uvm_loan.c        Sun Mar 19 23:44:34 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_loan.c,v 1.83 2012/07/30 23:56:48 matt Exp $       */
+/*     $NetBSD: uvm_loan.c,v 1.84 2017/03/19 23:44:35 riastradh Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.83 2012/07/30 23:56:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.84 2017/03/19 23:44:35 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1110,9 +1110,7 @@
 uvm_loanbreak(struct vm_page *uobjpage)
 {
        struct vm_page *pg;
-#ifdef DIAGNOSTIC
-       struct uvm_object *uobj = uobjpage->uobject;
-#endif
+       struct uvm_object *uobj __diagused = uobjpage->uobject;
 
        KASSERT(uobj != NULL);
        KASSERT(mutex_owned(uobj->vmobjlock));