Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Remove #ifdef DIAGNOSTIC now wrong after KASSERT change. 

Objects in question aren't volatile here so access is flushable.
This commit is contained in:
riastradh 2022-01-02 11:20:03 +00:00
parent bd51bf4f3e
commit b97383d000
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/arm/arm32/pmap.c
View File

@ -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);

6
sys/arch/arm/cortex/gic.c
View File

@ -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