[src/trunk]: src/sys/uvm Third time lucky...

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

details:   https://anonhg.NetBSD.org/src/rev/9bf9e0778123
branches:  trunk
changeset: 822435:9bf9e0778123
user:      kre <kre%NetBSD.org@localhost>
date:      Mon Mar 20 10:44:24 2017 +0000

description:
Third time lucky...

Why is there no PRI[xd]OFF ?   How are off_t's intended to be printed?

If a PRIxOFF gets added in some appropriate place, the XXX lines in this
commit can go away.

(I understand not having PRI[xd]VOFF).

diffstat:

 sys/uvm/uvm_bio.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 7bbcd144c663 -r 9bf9e0778123 sys/uvm/uvm_bio.c
--- a/sys/uvm/uvm_bio.c Mon Mar 20 10:20:16 2017 +0000
+++ b/sys/uvm/uvm_bio.c Mon Mar 20 10:44:24 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_bio.c,v 1.86 2017/03/20 07:31:28 kre Exp $ */
+/*     $NetBSD: uvm_bio.c,v 1.87 2017/03/20 10:44:24 kre Exp $ */
 
 /*
  * Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.86 2017/03/20 07:31:28 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.87 2017/03/20 10:44:24 kre Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
@@ -347,12 +347,15 @@
            va, ubc_offset, access_type, 0);
 
        if ((access_type & VM_PROT_WRITE) != 0) {
+#ifndef PRIxOFF                /* XXX */
+#define PRIxOFF "llx"  /* XXX */
+#endif                 /* XXX */
                KASSERTMSG((trunc_page(umap->writeoff) <= slot_offset),
-                   "out of range write: slot=%#"PRIxVSIZE" off=%#"PRIxVADDR,
+                   "out of range write: slot=%#"PRIxVSIZE" off=%#"PRIxOFF,
                    slot_offset, umap->writeoff);
                KASSERTMSG((slot_offset < umap->writeoff + umap->writelen),
-                   "out of range write: slot=%#"PRIxVSIZE
-                   "off=%#"PRIxVADDR" len=%#"PRIxVSIZE,
+                   "out of range write: slot=%#"PRIxVADDR
+                       " off=%#"PRIxOFF" len=%#"PRIxVSIZE,
                    slot_offset, umap->writeoff, umap->writelen);
        }