CVS commit: src/sys/uvm

[Rin Okuyama]

Module Name:    src
Committed By:   rin
Date:           Thu Jul  7 11:29:18 UTC 2022

Modified Files:
        src/sys/uvm: uvm_device.c uvm_mmap.c

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

They are not compile-time constants for sparc.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/uvm/uvm_device.c
cvs rdiff -u -r1.183 -r1.184 src/sys/uvm/uvm_mmap.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/uvm/uvm_device.c
diff -u src/sys/uvm/uvm_device.c:1.78 src/sys/uvm/uvm_device.c:1.79
--- src/sys/uvm/uvm_device.c:1.78	Wed Jul  6 13:52:24 2022
+++ src/sys/uvm/uvm_device.c	Thu Jul  7 11:29:18 2022
@@ -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 @@ udv_attach(dev_t device, vm_prot_t acces
 			 *
 			 *	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);

Index: src/sys/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.183 src/sys/uvm/uvm_mmap.c:1.184
--- src/sys/uvm/uvm_mmap.c:1.183	Wed Jul  6 01:12:46 2022
+++ src/sys/uvm/uvm_mmap.c	Thu Jul  7 11:29:18 2022
@@ -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 @@ sys_mmap(struct lwp *l, const struct sys
 	 */
 	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;
 	/*