Module Name: src
Committed By: skrll
Date: Sun Aug 9 09:11:41 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
Fix another UVMHIST so it doesn't use %s
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/aarch64/aarch64/pmap.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/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.84 src/sys/arch/aarch64/aarch64/pmap.c:1.85
--- src/sys/arch/aarch64/aarch64/pmap.c:1.84 Thu Jul 16 11:36:35 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Sun Aug 9 09:11:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.84 2020/07/16 11:36:35 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.85 2020/08/09 09:11:41 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.84 2020/07/16 11:36:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.85 2020/08/09 09:11:41 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -2236,7 +2236,6 @@ pmap_fault_fixup(struct pmap *pm, vaddr_
UVMHIST_LOG(pmaphist, "pm=%p, va=%016lx, accessprot=%08x",
pm, va, accessprot, 0);
-
#if 0
KASSERT_PM_ADDR(pm, va);
#else
@@ -2246,8 +2245,8 @@ pmap_fault_fixup(struct pmap *pm, vaddr_
!(IN_RANGE(va, VM_MIN_ADDRESS, VM_MAX_ADDRESS)))) {
UVMHIST_LOG(pmaphist,
- "pmap space and va mismatch: pm=%s, va=%016lx",
- (pm == pmap_kernel()) ? "kernel" : "user", va, 0, 0);
+ "pmap space and va mismatch: kernel=%jd, va=%016lx",
+ pm == pmap_kernel(), va, 0, 0);
return false;
}
#endif
