CVS commit: src/sys/uvm

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Tue Dec 15 06:15:11 UTC 2009

Modified Files:
        src/sys/uvm: uvm_map.c uvm_unix.c

Log Message:
Use PRIxVADDR... (change a printf/panic -> panic)


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.42 -r1.43 src/sys/uvm/uvm_unix.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_map.c
diff -u src/sys/uvm/uvm_map.c:1.285 src/sys/uvm/uvm_map.c:1.286
--- src/sys/uvm/uvm_map.c:1.285	Mon Dec 14 21:19:47 2009
+++ src/sys/uvm/uvm_map.c	Tue Dec 15 06:15:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.285 2009/12/14 21:19:47 matt Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.286 2009/12/15 06:15:11 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.285 2009/12/14 21:19:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.286 2009/12/15 06:15:11 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -2605,9 +2605,11 @@
 			if (tmpent->start < cur)
 				panic("uvm_map_replace1");
 			if (tmpent->start >= tmpent->end || tmpent->end > end) {
-		printf("tmpent->start=0x%lx, tmpent->end=0x%lx, end=0x%lx\n",
-			    tmpent->start, tmpent->end, end);
-				panic("uvm_map_replace2");
+				panic("uvm_map_replace2: "
+				    "tmpent->start=0x%"PRIxVADDR
+				    ", tmpent->end=0x%"PRIxVADDR
+				    ", end=0x%"PRIxVADDR,
+				    tmpent->start, tmpent->end, end);
 			}
 			cur = tmpent->end;
 			if (tmpent->next) {

Index: src/sys/uvm/uvm_unix.c
diff -u src/sys/uvm/uvm_unix.c:1.42 src/sys/uvm/uvm_unix.c:1.43
--- src/sys/uvm/uvm_unix.c:1.42	Fri Nov 27 12:25:10 2009
+++ src/sys/uvm/uvm_unix.c	Tue Dec 15 06:15:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_unix.c,v 1.42 2009/11/27 12:25:10 njoly Exp $	*/
+/*	$NetBSD: uvm_unix.c,v 1.43 2009/12/15 06:15:11 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.42 2009/11/27 12:25:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_unix.c,v 1.43 2009/12/15 06:15:11 matt Exp $");
 
 #include "opt_pax.h"
 
@@ -119,7 +119,7 @@
 				UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW));
 		if (error) {
 #ifdef DEBUG
-			uprintf("sbrk: grow %ld failed, error = %d\n",
+			uprintf("sbrk: grow %#"PRIxVADDR" failed, error = %d\n",
 			    new - old, error);
 #endif
 			mutex_exit(&p->p_auxlock);