[src/trunk]: src/sys/arch/arm/arm32 Convert a __CTASSERT into a KASSERT as L1...

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

details:   https://anonhg.NetBSD.org/src/rev/ee1092b118c8
branches:  trunk
changeset: 965628:ee1092b118c8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Sep 25 16:37:54 2019 +0000

description:
Convert a __CTASSERT into a KASSERT as L1_S_CACHE_MASK may not be a
compile time constant if ARM_NMMUS > 1

diffstat:

 sys/arch/arm/arm32/pmap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 777e2f659ffe -r ee1092b118c8 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Wed Sep 25 16:21:14 2019 +0000
+++ b/sys/arch/arm/arm32/pmap.c Wed Sep 25 16:37:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.373 2019/04/23 11:21:21 bouyer Exp $        */
+/*     $NetBSD: pmap.c,v 1.374 2019/09/25 16:37:54 skrll Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -221,7 +221,7 @@
 #include <arm/db_machdep.h>
 #endif
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.373 2019/04/23 11:21:21 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.374 2019/09/25 16:37:54 skrll Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -6406,7 +6406,7 @@
                pd_entry_t pde = *pdep;
 
                if (l1pte_section_p(pde)) {
-                       __CTASSERT((L1_S_CACHE_MASK & L1_S_V6_SUPER) == 0);
+                       KASSERT((L1_S_CACHE_MASK & L1_S_V6_SUPER) == 0);
                        if ((pde & L1_S_CACHE_MASK) != pte_l1_s_cache_mode_pt) {
                                *pdep = (pde & ~L1_S_CACHE_MASK) |
                                    pte_l1_s_cache_mode_pt;