[src/trunk]: src/sys/uvm/pmap %#jx vs %jx consistency in UVMHIST_LOG

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

details:   https://anonhg.NetBSD.org/src/rev/1de74aad28c7
branches:  trunk
changeset: 944705:1de74aad28c7
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 08 14:02:40 2020 +0000

description:
%#jx vs %jx consistency in UVMHIST_LOG

diffstat:

 sys/uvm/pmap/pmap.c        |  16 ++++++++--------
 sys/uvm/pmap/pmap_segtab.c |   8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (99 lines):

diff -r 2bc5f03834ff -r 1de74aad28c7 sys/uvm/pmap/pmap.c
--- a/sys/uvm/pmap/pmap.c       Thu Oct 08 13:44:36 2020 +0000
+++ b/sys/uvm/pmap/pmap.c       Thu Oct 08 14:02:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.56 2020/09/24 06:45:58 skrll Exp $  */
+/*     $NetBSD: pmap.c,v 1.57 2020/10/08 14:02:40 skrll Exp $  */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.56 2020/09/24 06:45:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.57 2020/10/08 14:02:40 skrll Exp $");
 
 /*
  *     Manages physical address maps.
@@ -407,13 +407,13 @@
        VM_PAGEMD_PVLIST_READLOCK(mdpg);
        pmap_pvlist_check(mdpg);
 
-       UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx", (uintptr_t)pv,
+       UVMHIST_LOG(pmaphist, "pv %#jx pv_pmap %#jx", (uintptr_t)pv,
            (uintptr_t)pv->pv_pmap, 0, 0);
 
        if (pv->pv_pmap != NULL) {
                for (; pv != NULL; pv = pv->pv_next) {
 #ifdef MULTIPROCESSOR
-                       UVMHIST_LOG(pmaphist, "pv %jx pv_pmap %jx",
+                       UVMHIST_LOG(pmaphist, "pv %#jx pv_pmap %#jx",
                            (uintptr_t)pv, (uintptr_t)pv->pv_pmap, 0, 0);
                        kcpuset_merge(onproc, pv->pv_pmap->pm_onproc);
                        if (kcpuset_match(onproc, kcpuset_running)) {
@@ -779,7 +779,7 @@
                npv = pv->pv_next;
 #ifdef PMAP_VIRTUAL_CACHE_ALIASES
                if (PV_ISKENTER_P(pv)) {
-                       UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %jx"
+                       UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %#jx"
                            " skip", (uintptr_t)pv, (uintptr_t)pv->pv_pmap,
                            pv->pv_va, 0);
 
@@ -815,8 +815,8 @@
                KASSERTMSG(ptep != NULL, "%#"PRIxVADDR " %#"PRIxVADDR, va,
                    pmap_limits.virtual_end);
                pt_entry_t pte = *ptep;
-               UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %jx"
-                   " pte %jx", (uintptr_t)pv, (uintptr_t)pmap, va,
+               UVMHIST_LOG(pmaphist, " pv %#jx pmap %#jx va %#jx"
+                   " pte %#jx", (uintptr_t)pv, (uintptr_t)pmap, va,
                    pte_value(pte));
                if (!pte_valid_p(pte))
                        continue;
@@ -918,7 +918,7 @@
        pmap_tlb_miss_lock_exit();
        kpreempt_enable();
 
-       UVMHIST_LOG(pmaphist, " <-- done (kernel=%#jx)",
+       UVMHIST_LOG(pmaphist, " <-- done (kernel=%jx)",
                    (pmap == pmap_kernel() ? 1 : 0), 0, 0, 0);
 }
 
diff -r 2bc5f03834ff -r 1de74aad28c7 sys/uvm/pmap/pmap_segtab.c
--- a/sys/uvm/pmap/pmap_segtab.c        Thu Oct 08 13:44:36 2020 +0000
+++ b/sys/uvm/pmap/pmap_segtab.c        Thu Oct 08 14:02:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_segtab.c,v 1.25 2020/09/24 06:45:58 skrll Exp $   */
+/*     $NetBSD: pmap_segtab.c,v 1.26 2020/10/08 14:02:40 skrll Exp $   */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.25 2020/09/24 06:45:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.26 2020/10/08 14:02:40 skrll Exp $");
 
 /*
  *     Manages physical address maps.
@@ -265,7 +265,7 @@
        UVMHIST_FUNC(__func__);
        UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx stpp=%#jx free=%jd",
            (uintptr_t)pmap, (uintptr_t)stp_p, free_stp, 0);
-       UVMHIST_LOG(pmapsegtabhist, " callback=%jx flags=%jx va=%jx vinc=%jx",
+       UVMHIST_LOG(pmapsegtabhist, " callback=%#jx flags=%jx va=%#jx vinc=%#jx",
            (uintptr_t)callback, flags, (uintptr_t)va, (uintptr_t)vinc);
        for (size_t i = (va / vinc) & (PMAP_SEGTABSIZE - 1);
             i < PMAP_SEGTABSIZE;
@@ -574,7 +574,7 @@
                *pte_p = pte;
 #endif
                KASSERT(pte == stp->seg_tab[(va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1)]);
-               UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx va=%#jx -> tab[%jd]=%jx",
+               UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx va=%#jx -> tab[%jd]=%#jx",
                    (uintptr_t)pmap, (uintptr_t)va,
                    (va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1), (uintptr_t)pte);