CVS commit: src/sys/uvm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Mar 19 23:44:35 UTC 2017

Modified Files:
        src/sys/uvm: uvm_fault.c uvm_km.c uvm_loan.c

Log Message:
__diagused police


To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.141 -r1.142 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.83 -r1.84 src/sys/uvm/uvm_loan.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_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.197 src/sys/uvm/uvm_fault.c:1.198
--- src/sys/uvm/uvm_fault.c:1.197	Mon Jun 22 06:24:17 2015
+++ src/sys/uvm/uvm_fault.c	Sun Mar 19 23:44:34 2017
@@ -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 @@ uvm_fault_lower(
 	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;

Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.141 src/sys/uvm/uvm_km.c:1.142
--- src/sys/uvm/uvm_km.c:1.141	Wed Jul 27 16:45:00 2016
+++ src/sys/uvm/uvm_km.c	Sun Mar 19 23:44:34 2017
@@ -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 @@ again:
 	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",

Index: src/sys/uvm/uvm_loan.c
diff -u src/sys/uvm/uvm_loan.c:1.83 src/sys/uvm/uvm_loan.c:1.84
--- src/sys/uvm/uvm_loan.c:1.83	Mon Jul 30 23:56:48 2012
+++ src/sys/uvm/uvm_loan.c	Sun Mar 19 23:44:35 2017
@@ -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 @@ struct vm_page *
 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));