Module Name: src
Committed By: uebayasi
Date: Sat Nov 6 15:42:50 UTC 2010
Modified Files:
src/sys/arch/acorn26/include: vmparam.h
src/sys/arch/acorn32/include: vmparam.h
src/sys/arch/alpha/include: vmparam.h
src/sys/arch/amd64/include: vmparam.h
src/sys/arch/amiga/include: vmparam.h
src/sys/arch/atari/include: vmparam.h
src/sys/arch/cats/include: vmparam.h
src/sys/arch/cesfic/include: vmparam.h
src/sys/arch/evbarm/include: vmparam.h
src/sys/arch/hp300/include: vmparam.h
src/sys/arch/hpcarm/include: vmparam.h
src/sys/arch/hppa/include: vmparam.h
src/sys/arch/i386/include: vmparam.h
src/sys/arch/ia64/include: vmparam.h
src/sys/arch/iyonix/include: vmparam.h
src/sys/arch/luna68k/include: vmparam.h
src/sys/arch/mac68k/include: vmparam.h
src/sys/arch/mips/include: vmparam.h
src/sys/arch/mvme68k/include: vmparam.h
src/sys/arch/netwinder/include: vmparam.h
src/sys/arch/news68k/include: vmparam.h
src/sys/arch/next68k/include: vmparam.h
src/sys/arch/powerpc/include/booke: vmparam.h
src/sys/arch/powerpc/include/ibm4xx: vmparam.h
src/sys/arch/powerpc/include/oea: vmparam.h
src/sys/arch/sh3/include: vmparam.h
src/sys/arch/shark/include: vmparam.h
src/sys/arch/sparc/include: vmparam.h
src/sys/arch/sparc64/include: vmparam.h
src/sys/arch/sun2/include: vmparam.h
src/sys/arch/sun3/include: vmparam.h
src/sys/arch/vax/include: vmparam.h
src/sys/arch/x68k/include: vmparam.h
src/sys/arch/zaurus/include: vmparam.h
src/sys/uvm: uvm_page.c
Log Message:
Remove incomplete, never worked dynamic run-time memory registration
(uvm_page_physload(9)). This functionality will be re-added later.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/include/vmparam.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/acorn32/include/vmparam.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/include/vmparam.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/include/vmparam.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amiga/include/vmparam.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/atari/include/vmparam.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cats/include/vmparam.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cesfic/include/vmparam.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/include/vmparam.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hp300/include/vmparam.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcarm/include/vmparam.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/vmparam.h
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/include/vmparam.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/vmparam.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/iyonix/include/vmparam.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/luna68k/include/vmparam.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mac68k/include/vmparam.h
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mvme68k/include/vmparam.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/netwinder/include/vmparam.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/news68k/include/vmparam.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/next68k/include/vmparam.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/booke/vmparam.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/ibm4xx/vmparam.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/include/oea/vmparam.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sh3/include/vmparam.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/shark/include/vmparam.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sparc/include/vmparam.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/include/vmparam.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sun2/include/vmparam.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sun3/include/vmparam.h
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/vax/include/vmparam.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x68k/include/vmparam.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/include/vmparam.h
cvs rdiff -u -r1.156 -r1.157 src/sys/uvm/uvm_page.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/arch/acorn26/include/vmparam.h
diff -u src/sys/arch/acorn26/include/vmparam.h:1.9 src/sys/arch/acorn26/include/vmparam.h:1.10
--- src/sys/arch/acorn26/include/vmparam.h:1.9 Fri Mar 6 20:31:46 2009
+++ src/sys/arch/acorn26/include/vmparam.h Sat Nov 6 15:42:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.9 2009/03/06 20:31:46 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.10 2010/11/06 15:42:43 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -100,8 +100,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD /* We won't turn up extra memory during autoconfig */
-
#define VM_NFREELIST 2
#define VM_FREELIST_LOW 1 /* DMA-able memory (bottom 512k phys) */
#define VM_FREELIST_DEFAULT 0 /* The rest */
Index: src/sys/arch/acorn32/include/vmparam.h
diff -u src/sys/arch/acorn32/include/vmparam.h:1.21 src/sys/arch/acorn32/include/vmparam.h:1.22
--- src/sys/arch/acorn32/include/vmparam.h:1.21 Thu Oct 25 13:03:03 2007
+++ src/sys/arch/acorn32/include/vmparam.h Sat Nov 6 15:42:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21 2007/10/25 13:03:03 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.22 2010/11/06 15:42:43 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/alpha/include/vmparam.h
diff -u src/sys/arch/alpha/include/vmparam.h:1.33 src/sys/arch/alpha/include/vmparam.h:1.34
--- src/sys/arch/alpha/include/vmparam.h:1.33 Fri Mar 6 20:31:46 2009
+++ src/sys/arch/alpha/include/vmparam.h Sat Nov 6 15:42:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.33 2009/03/06 20:31:46 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.34 2010/11/06 15:42:43 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -147,7 +147,6 @@
#define VM_PHYSSEG_MAX 16 /* XXX */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* no more after vm_mem_init */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/amd64/include/vmparam.h
diff -u src/sys/arch/amd64/include/vmparam.h:1.22 src/sys/arch/amd64/include/vmparam.h:1.23
--- src/sys/arch/amd64/include/vmparam.h:1.22 Sun Nov 22 21:41:03 2009
+++ src/sys/arch/amd64/include/vmparam.h Sat Nov 6 15:42:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.22 2009/11/22 21:41:03 bouyer Exp $ */
+/* $NetBSD: vmparam.h,v 1.23 2010/11/06 15:42:44 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -150,7 +150,6 @@
#define VM_PHYSSEG_MAX 10 /* 1 "hole" + 9 free lists */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#define VM_NFREELIST 3
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/amiga/include/vmparam.h
diff -u src/sys/arch/amiga/include/vmparam.h:1.39 src/sys/arch/amiga/include/vmparam.h:1.40
--- src/sys/arch/amiga/include/vmparam.h:1.39 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/amiga/include/vmparam.h Sat Nov 6 15:42:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.39 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.40 2010/11/06 15:42:44 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -159,7 +159,6 @@
*/
#define VM_PHYSSEG_MAX (16)
#define VM_PHYSSEG_STRAT VM_PSTRAT_RANDOM
-#define VM_PHYSSEG_NOADD /* XXX this should be done right later */
/*
* Allow supporting Zorro-II memory as lower priority:
Index: src/sys/arch/atari/include/vmparam.h
diff -u src/sys/arch/atari/include/vmparam.h:1.26 src/sys/arch/atari/include/vmparam.h:1.27
--- src/sys/arch/atari/include/vmparam.h:1.26 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/atari/include/vmparam.h Sat Nov 6 15:42:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.26 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.27 2010/11/06 15:42:44 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -156,7 +156,6 @@
*/
#define VM_PHYSSEG_MAX (2)
#define VM_PHYSSEG_STRAT VM_PSTRAT_RANDOM
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 2
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/cats/include/vmparam.h
diff -u src/sys/arch/cats/include/vmparam.h:1.26 src/sys/arch/cats/include/vmparam.h:1.27
--- src/sys/arch/cats/include/vmparam.h:1.26 Thu Oct 25 13:03:03 2007
+++ src/sys/arch/cats/include/vmparam.h Sat Nov 6 15:42:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.26 2007/10/25 13:03:03 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.27 2010/11/06 15:42:44 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/cesfic/include/vmparam.h
diff -u src/sys/arch/cesfic/include/vmparam.h:1.12 src/sys/arch/cesfic/include/vmparam.h:1.13
--- src/sys/arch/cesfic/include/vmparam.h:1.12 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/cesfic/include/vmparam.h Sat Nov 6 15:42:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.12 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.13 2010/11/06 15:42:44 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -177,7 +177,6 @@
*/
#define VM_PHYSSEG_MAX 1
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/evbarm/include/vmparam.h
diff -u src/sys/arch/evbarm/include/vmparam.h:1.25 src/sys/arch/evbarm/include/vmparam.h:1.26
--- src/sys/arch/evbarm/include/vmparam.h:1.25 Sun Apr 27 18:58:46 2008
+++ src/sys/arch/evbarm/include/vmparam.h Sat Nov 6 15:42:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.25 2008/04/27 18:58:46 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.26 2010/11/06 15:42:45 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -80,13 +80,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/hp300/include/vmparam.h
diff -u src/sys/arch/hp300/include/vmparam.h:1.35 src/sys/arch/hp300/include/vmparam.h:1.36
--- src/sys/arch/hp300/include/vmparam.h:1.35 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/hp300/include/vmparam.h Sat Nov 6 15:42:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.35 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.36 2010/11/06 15:42:45 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -171,7 +171,6 @@
*/
#define VM_PHYSSEG_MAX 1
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/hpcarm/include/vmparam.h
diff -u src/sys/arch/hpcarm/include/vmparam.h:1.28 src/sys/arch/hpcarm/include/vmparam.h:1.29
--- src/sys/arch/hpcarm/include/vmparam.h:1.28 Thu Oct 25 13:03:04 2007
+++ src/sys/arch/hpcarm/include/vmparam.h Sat Nov 6 15:42:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.28 2007/10/25 13:03:04 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.29 2010/11/06 15:42:45 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/hppa/include/vmparam.h
diff -u src/sys/arch/hppa/include/vmparam.h:1.15 src/sys/arch/hppa/include/vmparam.h:1.16
--- src/sys/arch/hppa/include/vmparam.h:1.15 Tue Feb 16 16:56:30 2010
+++ src/sys/arch/hppa/include/vmparam.h Sat Nov 6 15:42:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.15 2010/02/16 16:56:30 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.16 2010/11/06 15:42:45 uebayasi Exp $ */
/* $OpenBSD: vmparam.h,v 1.33 2006/06/04 17:21:24 miod Exp $ */
@@ -95,8 +95,6 @@
#define VM_PHYSSEG_MAX 8 /* this many physmem segments */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD /* XXX until uvm code is fixed */
-
#define VM_NFREELIST 2
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_ISADMA 1
Index: src/sys/arch/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.70 src/sys/arch/i386/include/vmparam.h:1.71
--- src/sys/arch/i386/include/vmparam.h:1.70 Fri Mar 6 20:31:49 2009
+++ src/sys/arch/i386/include/vmparam.h Sat Nov 6 15:42:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.70 2009/03/06 20:31:49 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.71 2010/11/06 15:42:45 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -122,7 +122,6 @@
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#ifdef XEN
#define VM_PHYSSEG_MAX 1
Index: src/sys/arch/ia64/include/vmparam.h
diff -u src/sys/arch/ia64/include/vmparam.h:1.5 src/sys/arch/ia64/include/vmparam.h:1.6
--- src/sys/arch/ia64/include/vmparam.h:1.5 Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/vmparam.h Sat Nov 6 15:42:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.5 2009/07/20 04:41:37 kiyohara Exp $ */
+/* $NetBSD: vmparam.h,v 1.6 2010/11/06 15:42:46 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -102,7 +102,6 @@
#define VM_PHYSSEG_MAX 16 /* XXX: */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* no more after vm_mem_init */
#define VM_NFREELIST 1 /* XXX: */
#define VM_FREELIST_DEFAULT 0 /* XXX: */
Index: src/sys/arch/iyonix/include/vmparam.h
diff -u src/sys/arch/iyonix/include/vmparam.h:1.3 src/sys/arch/iyonix/include/vmparam.h:1.4
--- src/sys/arch/iyonix/include/vmparam.h:1.3 Thu Oct 25 13:03:04 2007
+++ src/sys/arch/iyonix/include/vmparam.h Sat Nov 6 15:42:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.3 2007/10/25 13:03:04 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.4 2010/11/06 15:42:46 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/luna68k/include/vmparam.h
diff -u src/sys/arch/luna68k/include/vmparam.h:1.16 src/sys/arch/luna68k/include/vmparam.h:1.17
--- src/sys/arch/luna68k/include/vmparam.h:1.16 Mon Feb 8 19:02:29 2010
+++ src/sys/arch/luna68k/include/vmparam.h Sat Nov 6 15:42:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.16 2010/02/08 19:02:29 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.17 2010/11/06 15:42:46 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -149,7 +149,6 @@
*/
#define VM_PHYSSEG_MAX 1
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/mac68k/include/vmparam.h
diff -u src/sys/arch/mac68k/include/vmparam.h:1.40 src/sys/arch/mac68k/include/vmparam.h:1.41
--- src/sys/arch/mac68k/include/vmparam.h:1.40 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/mac68k/include/vmparam.h Sat Nov 6 15:42:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.40 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.41 2010/11/06 15:42:46 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -197,7 +197,6 @@
*/
#define VM_PHYSSEG_MAX 2
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.44 src/sys/arch/mips/include/vmparam.h:1.45
--- src/sys/arch/mips/include/vmparam.h:1.44 Mon Dec 14 00:46:05 2009
+++ src/sys/arch/mips/include/vmparam.h Sat Nov 6 15:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.44 2009/12/14 00:46:05 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.45 2010/11/06 15:42:47 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -200,7 +200,6 @@
/* VM_PHYSSEG_MAX defined by platform-dependent code. */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* can add RAM after vm_mem_init */
#define __HAVE_VM_PAGE_MD
Index: src/sys/arch/mvme68k/include/vmparam.h
diff -u src/sys/arch/mvme68k/include/vmparam.h:1.31 src/sys/arch/mvme68k/include/vmparam.h:1.32
--- src/sys/arch/mvme68k/include/vmparam.h:1.31 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/mvme68k/include/vmparam.h Sat Nov 6 15:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.31 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.32 2010/11/06 15:42:47 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -162,7 +162,6 @@
*/
#define VM_PHYSSEG_MAX 2
#define VM_PHYSSEG_STRAT VM_PSTRAT_RANDOM
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 2
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/netwinder/include/vmparam.h
diff -u src/sys/arch/netwinder/include/vmparam.h:1.24 src/sys/arch/netwinder/include/vmparam.h:1.25
--- src/sys/arch/netwinder/include/vmparam.h:1.24 Thu Oct 25 13:03:05 2007
+++ src/sys/arch/netwinder/include/vmparam.h Sat Nov 6 15:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.24 2007/10/25 13:03:05 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.25 2010/11/06 15:42:47 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/news68k/include/vmparam.h
diff -u src/sys/arch/news68k/include/vmparam.h:1.16 src/sys/arch/news68k/include/vmparam.h:1.17
--- src/sys/arch/news68k/include/vmparam.h:1.16 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/news68k/include/vmparam.h Sat Nov 6 15:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.16 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.17 2010/11/06 15:42:47 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -161,7 +161,6 @@
*/
#define VM_PHYSSEG_MAX 1
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/next68k/include/vmparam.h
diff -u src/sys/arch/next68k/include/vmparam.h:1.21 src/sys/arch/next68k/include/vmparam.h:1.22
--- src/sys/arch/next68k/include/vmparam.h:1.21 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/next68k/include/vmparam.h Sat Nov 6 15:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.22 2010/11/06 15:42:47 uebayasi Exp $ */
/*
* This file was taken from from mvme68k/include/vmparam.h and
@@ -167,7 +167,6 @@
*/
#define VM_PHYSSEG_MAX 5 /* @@@ should really come from N_SIMM */
#define VM_PHYSSEG_STRAT VM_PSTRAT_RANDOM
-#define VM_PHYSSEG_NOADD /* @@@ does the NeXT really need this? */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/powerpc/include/booke/vmparam.h
diff -u src/sys/arch/powerpc/include/booke/vmparam.h:1.1 src/sys/arch/powerpc/include/booke/vmparam.h:1.2
--- src/sys/arch/powerpc/include/booke/vmparam.h:1.1 Tue Mar 9 22:39:32 2010
+++ src/sys/arch/powerpc/include/booke/vmparam.h Sat Nov 6 15:42:48 2010
@@ -109,7 +109,6 @@
#define VM_PHYSSEG_MAX 16
#endif
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD
#ifndef VM_PHYS_SIZE
#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE)
Index: src/sys/arch/powerpc/include/ibm4xx/vmparam.h
diff -u src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.6 src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.7
--- src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.6 Fri Mar 6 20:31:51 2009
+++ src/sys/arch/powerpc/include/ibm4xx/vmparam.h Sat Nov 6 15:42:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.6 2009/03/06 20:31:51 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.7 2010/11/06 15:42:48 uebayasi Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -111,7 +111,6 @@
#define VM_PHYSSEG_MAX 16 /* 1? */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/powerpc/include/oea/vmparam.h
diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.14 src/sys/arch/powerpc/include/oea/vmparam.h:1.15
--- src/sys/arch/powerpc/include/oea/vmparam.h:1.14 Fri Mar 6 20:31:51 2009
+++ src/sys/arch/powerpc/include/oea/vmparam.h Sat Nov 6 15:42:48 2010
@@ -179,7 +179,6 @@
#define VM_PHYSSEG_MAX 16
#endif
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
-#define VM_PHYSSEG_NOADD
#ifndef VM_PHYS_SIZE
#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE)
Index: src/sys/arch/sh3/include/vmparam.h
diff -u src/sys/arch/sh3/include/vmparam.h:1.19 src/sys/arch/sh3/include/vmparam.h:1.20
--- src/sys/arch/sh3/include/vmparam.h:1.19 Fri Mar 6 20:31:51 2009
+++ src/sys/arch/sh3/include/vmparam.h Sat Nov 6 15:42:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.19 2009/03/06 20:31:51 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.20 2010/11/06 15:42:48 uebayasi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -78,7 +78,6 @@
/* Physical memory segments */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD
#define sh3_round_page(x) ((((uint32_t)(x)) + PGOFSET) & ~PGOFSET)
#define sh3_trunc_page(x) ((uint32_t)(x) & ~PGOFSET)
Index: src/sys/arch/shark/include/vmparam.h
diff -u src/sys/arch/shark/include/vmparam.h:1.16 src/sys/arch/shark/include/vmparam.h:1.17
--- src/sys/arch/shark/include/vmparam.h:1.16 Thu Oct 25 13:03:05 2007
+++ src/sys/arch/shark/include/vmparam.h Sat Nov 6 15:42:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.16 2007/10/25 13:03:05 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.17 2010/11/06 15:42:49 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/arch/sparc/include/vmparam.h
diff -u src/sys/arch/sparc/include/vmparam.h:1.40 src/sys/arch/sparc/include/vmparam.h:1.41
--- src/sys/arch/sparc/include/vmparam.h:1.40 Fri Mar 6 20:31:52 2009
+++ src/sys/arch/sparc/include/vmparam.h Sat Nov 6 15:42:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.40 2009/03/06 20:31:52 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.41 2010/11/06 15:42:49 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -114,7 +114,6 @@
#define VM_PHYSSEG_MAX 32 /* up to 32 segments */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/sparc64/include/vmparam.h
diff -u src/sys/arch/sparc64/include/vmparam.h:1.30 src/sys/arch/sparc64/include/vmparam.h:1.31
--- src/sys/arch/sparc64/include/vmparam.h:1.30 Fri Mar 6 20:31:52 2009
+++ src/sys/arch/sparc64/include/vmparam.h Sat Nov 6 15:42:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.30 2009/03/06 20:31:52 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.31 2010/11/06 15:42:49 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -165,7 +165,6 @@
#define VM_PHYSSEG_MAX 32 /* up to 32 segments */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/sun2/include/vmparam.h
diff -u src/sys/arch/sun2/include/vmparam.h:1.13 src/sys/arch/sun2/include/vmparam.h:1.14
--- src/sys/arch/sun2/include/vmparam.h:1.13 Fri Mar 6 20:31:53 2009
+++ src/sys/arch/sun2/include/vmparam.h Sat Nov 6 15:42:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.13 2009/03/06 20:31:53 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.14 2010/11/06 15:42:49 uebayasi Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -101,7 +101,6 @@
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/sun3/include/vmparam.h
diff -u src/sys/arch/sun3/include/vmparam.h:1.35 src/sys/arch/sun3/include/vmparam.h:1.36
--- src/sys/arch/sun3/include/vmparam.h:1.35 Fri Oct 15 15:55:52 2010
+++ src/sys/arch/sun3/include/vmparam.h Sat Nov 6 15:42:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.35 2010/10/15 15:55:52 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.36 2010/11/06 15:42:49 uebayasi Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -81,7 +81,6 @@
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_PHYSSEG_NOADD /* can't add RAM after vm_mem_init */
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/vax/include/vmparam.h
diff -u src/sys/arch/vax/include/vmparam.h:1.45 src/sys/arch/vax/include/vmparam.h:1.46
--- src/sys/arch/vax/include/vmparam.h:1.45 Fri Mar 6 20:31:53 2009
+++ src/sys/arch/vax/include/vmparam.h Sat Nov 6 15:42:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.45 2009/03/06 20:31:53 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.46 2010/11/06 15:42:50 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -78,7 +78,6 @@
#endif
#define VM_PHYSSEG_MAX 1
-#define VM_PHYSSEG_NOADD
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH /* XXX */
#define VM_NFREELIST 1
Index: src/sys/arch/x68k/include/vmparam.h
diff -u src/sys/arch/x68k/include/vmparam.h:1.31 src/sys/arch/x68k/include/vmparam.h:1.32
--- src/sys/arch/x68k/include/vmparam.h:1.31 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/x68k/include/vmparam.h Sat Nov 6 15:42:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.31 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.32 2010/11/06 15:42:50 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -153,7 +153,6 @@
#define VM_PHYSSEG_MAX 3
#define VM_PHYSSEG_STRAT VM_PSTRAT_BIGFIRST
/* Actually VM_PSTRAT_UPPERFIRST is needed */
-#define VM_PHYSSEG_NOADD
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/zaurus/include/vmparam.h
diff -u src/sys/arch/zaurus/include/vmparam.h:1.2 src/sys/arch/zaurus/include/vmparam.h:1.3
--- src/sys/arch/zaurus/include/vmparam.h:1.2 Thu Oct 25 13:03:05 2007
+++ src/sys/arch/zaurus/include/vmparam.h Sat Nov 6 15:42:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.2 2007/10/25 13:03:05 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.3 2010/11/06 15:42:50 uebayasi Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -76,13 +76,6 @@
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
/*
- * this indicates that we can't add RAM to the VM system after the
- * vm system is init'd.
- */
-
-#define VM_PHYSSEG_NOADD
-
-/*
* we support 2 free lists:
*
* - DEFAULT for all systems
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.156 src/sys/uvm/uvm_page.c:1.157
--- src/sys/uvm/uvm_page.c:1.156 Fri Sep 24 22:51:51 2010
+++ src/sys/uvm/uvm_page.c Sat Nov 6 15:42:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.156 2010/09/24 22:51:51 rmind Exp $ */
+/* $NetBSD: uvm_page.c,v 1.157 2010/11/06 15:42:43 uebayasi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.156 2010/09/24 22:51:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.157 2010/11/06 15:42:43 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -803,33 +803,7 @@
*/
if (!preload) {
-#if defined(VM_PHYSSEG_NOADD)
panic("uvm_page_physload: tried to add RAM after vm_mem_init");
-#else
- /* XXXCDC: need some sort of lockout for this case */
- paddr_t paddr;
- npages = end - start; /* # of pages */
- pgs = malloc(sizeof(struct vm_page) * npages,
- M_VMPAGE, M_NOWAIT);
- if (pgs == NULL) {
- printf("uvm_page_physload: can not malloc vm_page "
- "structs for segment\n");
- printf("\tignoring 0x%lx -> 0x%lx\n", start, end);
- return;
- }
- /* zero data, init phys_addr and free_list, and free pages */
- memset(pgs, 0, sizeof(struct vm_page) * npages);
- for (lcv = 0, paddr = ctob(start) ;
- lcv < npages ; lcv++, paddr += PAGE_SIZE) {
- pgs[lcv].phys_addr = paddr;
- pgs[lcv].free_list = free_list;
- if (atop(paddr) >= avail_start &&
- atop(paddr) <= avail_end)
- uvm_pagefree(&pgs[lcv]);
- }
- /* XXXCDC: incomplete: need to update uvmexp.free, what else? */
- /* XXXCDC: need hook to tell pmap to rebuild pv_list, etc... */
-#endif
} else {
pgs = NULL;
npages = 0;
