Module Name: src
Committed By: kre
Date: Mon Mar 20 10:44:24 UTC 2017
Modified Files:
src/sys/uvm: uvm_bio.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/uvm/uvm_bio.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_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.86 src/sys/uvm/uvm_bio.c:1.87
--- src/sys/uvm/uvm_bio.c:1.86 Mon Mar 20 07:31:28 2017
+++ src/sys/uvm/uvm_bio.c Mon Mar 20 10:44:24 2017
@@ -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 @@ ubc_fault(struct uvm_faultinfo *ufi, vad
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);
}
