Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64/aarch64 Don't use %s in UVMHIST_PRINT. Rem...



details:   https://anonhg.NetBSD.org/src/rev/d1f110e0bf85
branches:  trunk
changeset: 974711:d1f110e0bf85
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Aug 09 07:26:20 2020 +0000

description:
Don't use %s in UVMHIST_PRINT.  Remove an unnecessary #ifdef UVMHIST while
I'm here

diffstat:

 sys/arch/aarch64/aarch64/fault.c |  15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r 2541ae742daa -r d1f110e0bf85 sys/arch/aarch64/aarch64/fault.c
--- a/sys/arch/aarch64/aarch64/fault.c  Sun Aug 09 07:18:03 2020 +0000
+++ b/sys/arch/aarch64/aarch64/fault.c  Sun Aug 09 07:26:20 2020 +0000
@@ -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 <ryo%nerv.org@localhost>
@@ -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 @@
        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))) {



Home | Main Index | Thread Index | Old Index