CVS commit: src/sys/uvm

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sat Apr 17 21:37:21 UTC 2021

Modified Files:
        src/sys/uvm: uvm_map.c uvm_pdaemon.c

Log Message:
fix error in previous: UVMHIST_PDHIST_SIZE needs to stay next to pdhistbuf[].


To generate a diff of this commit:
cvs rdiff -u -r1.387 -r1.388 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.132 -r1.133 src/sys/uvm/uvm_pdaemon.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_map.c
diff -u src/sys/uvm/uvm_map.c:1.387 src/sys/uvm/uvm_map.c:1.388
--- src/sys/uvm/uvm_map.c:1.387	Sat Apr 17 01:53:58 2021
+++ src/sys/uvm/uvm_map.c	Sat Apr 17 21:37:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.387 2021/04/17 01:53:58 mrg Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.388 2021/04/17 21:37:21 mrg Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.387 2021/04/17 01:53:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.388 2021/04/17 21:37:21 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pax.h"
@@ -105,9 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 
 #ifndef UVMHIST_MAPHIST_SIZE
 #define UVMHIST_MAPHIST_SIZE 100
 #endif
-#ifndef UVMHIST_PDHIST_SIZE
-#define UVMHIST_PDHIST_SIZE 100
-#endif
 static struct kern_history_ent maphistbuf[UVMHIST_MAPHIST_SIZE];
 UVMHIST_DEFINE(maphist) = UVMHIST_INITIALIZER(maphist, maphistbuf);
 #endif

Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.132 src/sys/uvm/uvm_pdaemon.c:1.133
--- src/sys/uvm/uvm_pdaemon.c:1.132	Sat Apr 17 01:53:58 2021
+++ src/sys/uvm/uvm_pdaemon.c	Sat Apr 17 21:37:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pdaemon.c,v 1.132 2021/04/17 01:53:58 mrg Exp $	*/
+/*	$NetBSD: uvm_pdaemon.c,v 1.133 2021/04/17 21:37:21 mrg Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.132 2021/04/17 01:53:58 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.133 2021/04/17 21:37:21 mrg Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
@@ -88,6 +88,9 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.
 #include <uvm/uvm_pgflcache.h>
 
 #ifdef UVMHIST
+#ifndef UVMHIST_PDHIST_SIZE
+#define UVMHIST_PDHIST_SIZE 100
+#endif
 static struct kern_history_ent pdhistbuf[UVMHIST_PDHIST_SIZE];
 UVMHIST_DEFINE(pdhist) = UVMHIST_INITIALIZER(pdhisthist, pdhistbuf);
 #endif