Module Name: src
Committed By: matt
Date: Fri Dec 11 20:22:16 UTC 2009
Modified Files:
src/sys/arch/cobalt/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/evbmips/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/ews4800mips/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/hpcmips/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/mips/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/mipsco/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/newsmips/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/sbmips/include [matt-nb5-mips64]: vmparam.h
src/sys/arch/sgimips/include [matt-nb5-mips64]: vmparam.h
Log Message:
Use the default set of VM_FREELISTs in <mips/vmparam.h> but allow them to
be overridden (for pmax).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.154.1 src/sys/arch/cobalt/include/vmparam.h
cvs rdiff -u -r1.1.142.1 -r1.1.142.2 src/sys/arch/evbmips/include/vmparam.h
cvs rdiff -u -r1.1 -r1.1.98.1 src/sys/arch/ews4800mips/include/vmparam.h
cvs rdiff -u -r1.4 -r1.4.140.1 src/sys/arch/hpcmips/include/vmparam.h
cvs rdiff -u -r1.41.28.6 -r1.41.28.7 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.1 -r1.1.150.1 src/sys/arch/mipsco/include/vmparam.h
cvs rdiff -u -r1.4 -r1.4.148.1 src/sys/arch/newsmips/include/vmparam.h
cvs rdiff -u -r1.1 -r1.1.142.1 src/sys/arch/sbmips/include/vmparam.h
cvs rdiff -u -r1.1 -r1.1.154.1 src/sys/arch/sgimips/include/vmparam.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cobalt/include/vmparam.h
diff -u src/sys/arch/cobalt/include/vmparam.h:1.2 src/sys/arch/cobalt/include/vmparam.h:1.2.154.1
--- src/sys/arch/cobalt/include/vmparam.h:1.2 Fri Mar 31 14:51:53 2000
+++ src/sys/arch/cobalt/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,8 +1,5 @@
-/* $NetBSD: vmparam.h,v 1.2 2000/03/31 14:51:53 soren Exp $ */
+/* $NetBSD: vmparam.h,v 1.2.154.1 2009/12/11 20:22:15 matt Exp $ */
#include <mips/vmparam.h>
#define VM_PHYSSEG_MAX 1
-
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/evbmips/include/vmparam.h
diff -u src/sys/arch/evbmips/include/vmparam.h:1.1.142.1 src/sys/arch/evbmips/include/vmparam.h:1.1.142.2
--- src/sys/arch/evbmips/include/vmparam.h:1.1.142.1 Sun Sep 13 03:33:08 2009
+++ src/sys/arch/evbmips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.1.142.1 2009/09/13 03:33:08 cliff Exp $ */
+/* $NetBSD: vmparam.h,v 1.1.142.2 2009/12/11 20:22:15 matt Exp $ */
#ifndef _EVBMIPS_VMPARAM_H_
#define _EVBMIPS_VMPARAM_H_
@@ -7,7 +7,4 @@
#define VM_PHYSSEG_MAX 32
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
-
#endif /* !_EVBMIPS_VMPARAM_H_ */
Index: src/sys/arch/ews4800mips/include/vmparam.h
diff -u src/sys/arch/ews4800mips/include/vmparam.h:1.1 src/sys/arch/ews4800mips/include/vmparam.h:1.1.98.1
--- src/sys/arch/ews4800mips/include/vmparam.h:1.1 Thu Dec 29 15:20:09 2005
+++ src/sys/arch/ews4800mips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.1 2005/12/29 15:20:09 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.1.98.1 2009/12/11 20:22:15 matt Exp $ */
#ifndef _EWS4800MIPS_VMPARAM_H_
#define _EWS4800MIPS_VMPARAM_H_
@@ -14,9 +14,6 @@
#define VM_PHYSSEG_MAX 9 /* M0-M8 */
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
-
#ifndef KSEG2IOBUFSIZE
/* reserve PTEs for KSEG2 I/O space */
#define KSEG2IOBUFSIZE kseg2iobufsize
Index: src/sys/arch/hpcmips/include/vmparam.h
diff -u src/sys/arch/hpcmips/include/vmparam.h:1.4 src/sys/arch/hpcmips/include/vmparam.h:1.4.140.1
--- src/sys/arch/hpcmips/include/vmparam.h:1.4 Thu Jan 31 17:56:34 2002
+++ src/sys/arch/hpcmips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,12 +1,9 @@
-/* $NetBSD: vmparam.h,v 1.4 2002/01/31 17:56:34 uch Exp $ */
+/* $NetBSD: vmparam.h,v 1.4.140.1 2009/12/11 20:22:15 matt Exp $ */
#include <mips/vmparam.h>
#include <sys/kcore.h>
#define VM_PHYSSEG_MAX 5
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
-
extern phys_ram_seg_t mem_clusters[];
extern int mem_cluster_cnt;
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.41.28.6 src/sys/arch/mips/include/vmparam.h:1.41.28.7
--- src/sys/arch/mips/include/vmparam.h:1.41.28.6 Tue Dec 8 18:10:54 2009
+++ src/sys/arch/mips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.41.28.6 2009/12/08 18:10:54 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.41.28.7 2009/12/11 20:22:15 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -219,11 +219,13 @@
(pg)->mdpage.pvh_list = NULL; \
} while (/* CONSTCOND */ 0)
+#ifndef VM_NFREELIST
#define VM_NFREELIST 16 /* 16 distinct memory segments */
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_FIRST16M 1 /* ISA DMA range */
#define VM_FREELIST_FIRST512M 2 /* KSEG0/1 */
#define VM_FREELIST_FIRST4G 3 /* 32bit addrs */
#define VM_FREELIST_MAX 4
+#endif
#endif /* ! _MIPS_VMPARAM_H_ */
Index: src/sys/arch/mipsco/include/vmparam.h
diff -u src/sys/arch/mipsco/include/vmparam.h:1.1 src/sys/arch/mipsco/include/vmparam.h:1.1.150.1
--- src/sys/arch/mipsco/include/vmparam.h:1.1 Sat Aug 12 22:58:48 2000
+++ src/sys/arch/mipsco/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.1 2000/08/12 22:58:48 wdk Exp $ */
+/* $NetBSD: vmparam.h,v 1.1.150.1 2009/12/11 20:22:15 matt Exp $ */
#include <mips/vmparam.h>
@@ -6,6 +6,3 @@
* One physical memory segment
*/
#define VM_PHYSSEG_MAX 1
-
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/newsmips/include/vmparam.h
diff -u src/sys/arch/newsmips/include/vmparam.h:1.4 src/sys/arch/newsmips/include/vmparam.h:1.4.148.1
--- src/sys/arch/newsmips/include/vmparam.h:1.4 Fri Dec 1 17:57:44 2000
+++ src/sys/arch/newsmips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.4 2000/12/01 17:57:44 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.4.148.1 2009/12/11 20:22:15 matt Exp $ */
#include <mips/vmparam.h>
@@ -6,6 +6,3 @@
* NEWS has one physical memory segment.
*/
#define VM_PHYSSEG_MAX 1
-
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/sbmips/include/vmparam.h
diff -u src/sys/arch/sbmips/include/vmparam.h:1.1 src/sys/arch/sbmips/include/vmparam.h:1.1.142.1
--- src/sys/arch/sbmips/include/vmparam.h:1.1 Wed Mar 6 02:13:50 2002
+++ src/sys/arch/sbmips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,9 +1,6 @@
-/* $NetBSD: vmparam.h,v 1.1 2002/03/06 02:13:50 simonb Exp $ */
+/* $NetBSD: vmparam.h,v 1.1.142.1 2009/12/11 20:22:15 matt Exp $ */
#include <mips/vmparam.h>
/* XXXcgd */
#define VM_PHYSSEG_MAX 8
-
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/sgimips/include/vmparam.h
diff -u src/sys/arch/sgimips/include/vmparam.h:1.1 src/sys/arch/sgimips/include/vmparam.h:1.1.154.1
--- src/sys/arch/sgimips/include/vmparam.h:1.1 Wed Jun 14 15:40:01 2000
+++ src/sys/arch/sgimips/include/vmparam.h Fri Dec 11 20:22:15 2009
@@ -1,8 +1,5 @@
-/* $NetBSD: vmparam.h,v 1.1 2000/06/14 15:40:01 soren Exp $ */
+/* $NetBSD: vmparam.h,v 1.1.154.1 2009/12/11 20:22:15 matt Exp $ */
#include <mips/vmparam.h>
#define VM_PHYSSEG_MAX 32
-
-#define VM_NFREELIST 1
-#define VM_FREELIST_DEFAULT 0
