Module Name: src
Committed By: skrll
Date: Sun Aug 9 07:26:20 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: fault.c
Log Message:
Don't use %s in UVMHIST_PRINT. Remove an unnecessary #ifdef UVMHIST while
I'm here
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/fault.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/fault.c
diff -u src/sys/arch/aarch64/aarch64/fault.c:1.18 src/sys/arch/aarch64/aarch64/fault.c:1.19
--- src/sys/arch/aarch64/aarch64/fault.c:1.18 Thu Aug 6 06:50:39 2020
+++ src/sys/arch/aarch64/aarch64/fault.c Sun Aug 9 07:26:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.18 2020/08/06 06:50:39 ryo Exp $ */
+/* $NetBSD: fault.c,v 1.19 2020/08/09 07:26:20 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.18 2020/08/06 06:50:39 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.19 2020/08/09 07:26:20 skrll Exp $");
#include "opt_compat_netbsd32.h"
#include "opt_ddb.h"
@@ -181,16 +181,13 @@ data_abort_handler(struct trapframe *tf,
else
ftype = (rw == 0) ? VM_PROT_READ : VM_PROT_WRITE;
-#ifdef UVMHIST
if (ftype & VM_PROT_EXECUTE) {
- UVMHIST_LOG(pmaphist, "pagefault %016lx %016lx in %s EXEC",
- tf->tf_far, va, user ? "user" : "kernel", 0);
+ UVMHIST_LOG(pmaphist, "pagefault %016jx %016jx user=%jd EXEC",
+ tf->tf_far, va, user, 0);
} else {
- UVMHIST_LOG(pmaphist, "pagefault %016lx %016lx in %s %s",
- tf->tf_far, va, user ? "user" : "kernel",
- (rw == 0) ? "read" : "write");
+ UVMHIST_LOG(pmaphist, "pagefault %016lx %016lx user=%jd "
+ "write=%jd", tf->tf_far, va, user, rw);
}
-#endif
if (__predict_false(!user && (map != kernel_map) &&
(tf->tf_spsr & SPSR_PAN))) {
