Module Name: src Committed By: riastradh Date: Sun Jan 2 11:20:03 UTC 2022
Modified Files: src/sys/arch/arm/arm32: pmap.c src/sys/arch/arm/cortex: gic.c Log Message: arm: Remove #ifdef DIAGNOSTIC now wrong after KASSERT change. Objects in question aren't volatile here so access is flushable. To generate a diff of this commit: cvs rdiff -u -r1.431 -r1.432 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/cortex/gic.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/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.431 src/sys/arch/arm/arm32/pmap.c:1.432 --- src/sys/arch/arm/arm32/pmap.c:1.431 Sat Jan 1 15:09:01 2022 +++ src/sys/arch/arm/arm32/pmap.c Sun Jan 2 11:20:03 2022 @@ -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, v 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); Index: src/sys/arch/arm/cortex/gic.c diff -u src/sys/arch/arm/cortex/gic.c:1.51 src/sys/arch/arm/cortex/gic.c:1.52 --- src/sys/arch/arm/cortex/gic.c:1.51 Thu Oct 21 04:47:57 2021 +++ src/sys/arch/arm/cortex/gic.c Sun Jan 2 11:20:03 2022 @@ -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