CVS commit: src/sys

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sun Feb 26 07:27:14 UTC 2023

Modified Files:
        src/sys/rump/librump/rumpkern: emul.c
        src/sys/uvm: uvm_extern.h uvm_km.c

Log Message:
nkmempages should be size_t


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.232 -r1.233 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.163 -r1.164 src/sys/uvm/uvm_km.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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.196 src/sys/rump/librump/rumpkern/emul.c:1.197
--- src/sys/rump/librump/rumpkern/emul.c:1.196	Thu Apr 30 03:28:19 2020
+++ src/sys/rump/librump/rumpkern/emul.c	Sun Feb 26 07:27:14 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.196 2020/04/30 03:28:19 riastradh Exp $	*/
+/*	$NetBSD: emul.c,v 1.197 2023/02/26 07:27:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.196 2020/04/30 03:28:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.197 2023/02/26 07:27:14 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/cprng.h>
@@ -57,7 +57,7 @@ void (*rump_vfs_fini)(void) = (void *)nu
  */
 #define PHYSMEM 512*256
 psize_t physmem = PHYSMEM;
-int nkmempages = PHYSMEM/2; /* from le chapeau */
+size_t nkmempages = PHYSMEM/2; /* from le chapeau */
 #undef PHYSMEM
 
 struct vnode *rootvp;

Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.232 src/sys/uvm/uvm_extern.h:1.233
--- src/sys/uvm/uvm_extern.h:1.232	Mon May 31 10:57:02 2021
+++ src/sys/uvm/uvm_extern.h	Sun Feb 26 07:27:14 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_extern.h,v 1.232 2021/05/31 10:57:02 riastradh Exp $	*/
+/*	$NetBSD: uvm_extern.h,v 1.233 2023/02/26 07:27:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -840,7 +840,7 @@ bool			uvn_needs_writefault_p(struct uvm
 
 /* kern_malloc.c */
 void			kmeminit_nkmempages(void);
-extern int		nkmempages;
+extern size_t		nkmempages;
 
 #endif /* _KERNEL */
 

Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.163 src/sys/uvm/uvm_km.c:1.164
--- src/sys/uvm/uvm_km.c:1.163	Sun Feb 12 16:28:32 2023
+++ src/sys/uvm/uvm_km.c	Sun Feb 26 07:27:14 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_km.c,v 1.163 2023/02/12 16:28:32 andvar Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.164 2023/02/26 07:27:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.163 2023/02/12 16:28:32 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.164 2023/02/26 07:27:14 skrll Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -201,7 +201,7 @@ static struct vm_map		kernel_map_store;
 static struct vm_map_entry	kernel_image_mapent_store;
 static struct vm_map_entry	kernel_kmem_mapent_store;
 
-int nkmempages = 0;
+size_t nkmempages = 0;
 vaddr_t kmembase;
 vsize_t kmemsize;
 
@@ -216,7 +216,7 @@ vmem_t *kmem_va_arena;
 void
 kmeminit_nkmempages(void)
 {
-	int npages;
+	size_t npages;
 
 	if (nkmempages != 0) {
 		/*