[src/trunk]: src/sys/arch/aarch64/aarch64 Fix non-UVMHIST build

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

details:   https://anonhg.NetBSD.org/src/rev/57821ddfaf34
branches:  trunk
changeset: 1024423:57821ddfaf34
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Oct 23 06:49:46 2021 +0000

description:
Fix non-UVMHIST build

diffstat:

 sys/arch/aarch64/aarch64/pmap.c |  21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diffs (56 lines):

diff -r 13c4bd47db44 -r 57821ddfaf34 sys/arch/aarch64/aarch64/pmap.c
--- a/sys/arch/aarch64/aarch64/pmap.c   Sat Oct 23 06:48:31 2021 +0000
+++ b/sys/arch/aarch64/aarch64/pmap.c   Sat Oct 23 06:49:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.118 2021/10/16 06:34:30 ryo Exp $   */
+/*     $NetBSD: pmap.c,v 1.119 2021/10/23 06:49:46 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.118 2021/10/16 06:34:30 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.119 2021/10/23 06:49:46 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -1455,10 +1455,8 @@
        /* this calls tlb_set_asid which calls cpu_set_ttbr0 */
        pmap_tlb_asid_acquire(pm, l);
 
-       struct pmap_asid_info * const pai __debugused = PMAP_PAI(pm,
-           cpu_tlb_info(ci));
-
-       UVMHIST_LOG(pmaphist, "lwp=%p, asid=%d", l, pai->pai_asid, 0, 0);
+       UVMHIST_LOG(pmaphist, "lwp=%p, asid=%d", l,
+           PMAP_PAI(pm, cpu_tlb_info(ci))->pai_asid, 0, 0);
 
        /* Re-enable translation table walks using TTBR0 */
        tcr = reg_tcr_el1_read();
@@ -1485,10 +1483,8 @@
        reg_tcr_el1_write(tcr | TCR_EPD0);
        isb();
 
-       struct pmap_asid_info * const pai __debugused = PMAP_PAI(pm,
-           cpu_tlb_info(ci));
-
-       UVMHIST_LOG(pmaphist, "lwp=%p, asid=%d", l, pai->pai_asid, 0, 0);
+       UVMHIST_LOG(pmaphist, "lwp=%p, asid=%d", l,
+           PMAP_PAI(pm, cpu_tlb_info(ci))->pai_asid, 0, 0);
 
        pmap_tlb_asid_deactivate(pm);
 
@@ -2123,9 +2119,8 @@
        pmap_tlb_asid_release_all(pm);
        pm->pm_remove_all = true;
 
-       struct pmap_asid_info * const pai __debugused = PMAP_PAI(pm,
-           cpu_tlb_info(ci));
-       UVMHIST_LOG(pmaphist, "pm=%p, asid=%d", pm, pai->pai_asid, 0, 0);
+       UVMHIST_LOG(pmaphist, "pm=%p, asid=%d", pm,
+           PMAP_PAI(pm, cpu_tlb_info(ci))->pai_asid, 0, 0);
 
        pm_lock(pm);