[src/trunk]: src/sys/uvm Convert CTASSERT(9) for PAGE_{SIZE,MASK} into KASSER...

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

details:   https://anonhg.NetBSD.org/src/rev/7dfc3da5a90f
branches:  trunk
changeset: 368366:7dfc3da5a90f
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Jul 07 11:29:18 2022 +0000

description:
Convert CTASSERT(9) for PAGE_{SIZE,MASK} into KASSERT(9).

They are not compile-time constants for sparc.

diffstat:

 sys/uvm/uvm_device.c |  6 +++---
 sys/uvm/uvm_mmap.c   |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r b0e0ff4c13fd -r 7dfc3da5a90f sys/uvm/uvm_device.c
--- a/sys/uvm/uvm_device.c      Thu Jul 07 10:06:02 2022 +0000
+++ b/sys/uvm/uvm_device.c      Thu Jul 07 11:29:18 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_device.c,v 1.78 2022/07/06 13:52:24 riastradh Exp $        */
+/*     $NetBSD: uvm_device.c,v 1.79 2022/07/07 11:29:18 rin Exp $      */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.78 2022/07/06 13:52:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.79 2022/07/07 11:29:18 rin Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -168,7 +168,7 @@
                         *
                         *      off += PAGE_SIZE - 2*(VOFF_MAX + 1).
                         */
-                       CTASSERT(PAGE_SIZE >= 2);
+                       KASSERT(PAGE_SIZE >= 2);
                        off -= __type_max(voff_t);
                        off += PAGE_SIZE - 2;
                        off -= __type_max(voff_t);
diff -r b0e0ff4c13fd -r 7dfc3da5a90f sys/uvm/uvm_mmap.c
--- a/sys/uvm/uvm_mmap.c        Thu Jul 07 10:06:02 2022 +0000
+++ b/sys/uvm/uvm_mmap.c        Thu Jul 07 11:29:18 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_mmap.c,v 1.183 2022/07/06 01:12:46 riastradh Exp $ */
+/*     $NetBSD: uvm_mmap.c,v 1.184 2022/07/07 11:29:18 rin Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.183 2022/07/06 01:12:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.184 2022/07/07 11:29:18 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_pax.h"
@@ -314,8 +314,8 @@
         */
        pageoff = pos & PAGE_MASK;
        pos -= pageoff;
-       CTASSERT(PAGE_MASK <= __type_max(vsize_t));
-       CTASSERT((__type_max(vsize_t) - PAGE_SIZE + 1) % PAGE_SIZE == 0);
+       KASSERT(PAGE_MASK <= __type_max(vsize_t));
+       KASSERT((__type_max(vsize_t) - PAGE_SIZE + 1) % PAGE_SIZE == 0);
        if (size > __type_max(vsize_t) - PAGE_SIZE + 1 - pageoff)
                return ENOMEM;
        /*