From b97383d000101e0cbf9132773a1a89a30df4261e Mon Sep 17 00:00:00 2001
From: riastradh <riastradh@NetBSD.org>
Date: Sun, 2 Jan 2022 11:20:03 +0000
Subject: [PATCH] arm: Remove #ifdef DIAGNOSTIC now wrong after KASSERT change.

Objects in question aren't volatile here so access is flushable.
---
 sys/arch/arm/arm32/pmap.c | 8 +++-----
 sys/arch/arm/cortex/gic.c | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys/arch/arm/arm32/pmap.c b/sys/arch/arm/arm32/pmap.c
index 6bb1fc9cd76e..2a3520f39e5e 100644
--- a/sys/arch/arm/arm32/pmap.c
+++ b/sys/arch/arm/arm32/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.431 2022/01/01 15:09:01 christos Exp $	*/
+/*	$NetBSD: pmap.c,v 1.432 2022/01/02 11:20:03 riastradh Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -192,7 +192,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.431 2022/01/01 15:09:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.432 2022/01/02 11:20:03 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -3747,9 +3747,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
 		PMAPCOUNT(kenter_remappings);
 #ifdef PMAP_CACHE_VIPT
 		opg = PHYS_TO_VM_PAGE(l2pte_pa(opte));
-#if !defined(ARM_MMU_EXTENDED) || defined(DIAGNOSTIC)
-		struct vm_page_md *omd __diagused = VM_PAGE_TO_MD(opg);
-#endif
+		struct vm_page_md *omd = VM_PAGE_TO_MD(opg);
 		if (opg && arm_cache_prefer_mask != 0) {
 			KASSERT(opg != pg);
 			KASSERT((omd->pvh_attrs & PVF_KMPAGE) == 0);
diff --git a/sys/arch/arm/cortex/gic.c b/sys/arch/arm/cortex/gic.c
index 823dd92730d9..7a75d7a061b8 100644
--- a/sys/arch/arm/cortex/gic.c
+++ b/sys/arch/arm/cortex/gic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gic.c,v 1.51 2021/10/21 04:47:57 skrll Exp $	*/
+/*	$NetBSD: gic.c,v 1.52 2022/01/02 11:20:03 riastradh Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.51 2021/10/21 04:47:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.52 2022/01/02 11:20:03 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -321,10 +321,8 @@ armgic_irq_handler(void *tf)
 	struct cpu_info * const ci = curcpu();
 	struct armgic_softc * const sc = &armgic_softc;
 	const int old_ipl = ci->ci_cpl;
-#ifdef DIAGNOSTIC
 	const int old_mtx_count = ci->ci_mtx_count;
 	const int old_l_biglocks = ci->ci_curlwp->l_biglocks;
-#endif
 #ifdef DEBUG
 	size_t n = 0;
 #endif