Module Name: src
Committed By: uebayasi
Date: Mon Apr 26 06:19:06 UTC 2010
Modified Files:
src/sys/arch/acorn26/include [uebayasi-xip]: vmparam.h
src/sys/arch/acorn32/include [uebayasi-xip]: vmparam.h
src/sys/arch/alpha/include [uebayasi-xip]: vmparam.h
src/sys/arch/amd64/include [uebayasi-xip]: vmparam.h
src/sys/arch/amiga/include [uebayasi-xip]: vmparam.h
src/sys/arch/atari/include [uebayasi-xip]: vmparam.h
src/sys/arch/cats/include [uebayasi-xip]: vmparam.h
src/sys/arch/cesfic/include [uebayasi-xip]: vmparam.h
src/sys/arch/evbarm/include [uebayasi-xip]: vmparam.h
src/sys/arch/hp300/include [uebayasi-xip]: vmparam.h
src/sys/arch/hpcarm/include [uebayasi-xip]: vmparam.h
src/sys/arch/hppa/include [uebayasi-xip]: vmparam.h
src/sys/arch/i386/include [uebayasi-xip]: vmparam.h
src/sys/arch/ia64/include [uebayasi-xip]: vmparam.h
src/sys/arch/iyonix/include [uebayasi-xip]: vmparam.h
src/sys/arch/luna68k/include [uebayasi-xip]: vmparam.h
src/sys/arch/mac68k/include [uebayasi-xip]: vmparam.h
src/sys/arch/mips/include [uebayasi-xip]: vmparam.h
src/sys/arch/mvme68k/include [uebayasi-xip]: vmparam.h
src/sys/arch/netwinder/include [uebayasi-xip]: vmparam.h
src/sys/arch/news68k/include [uebayasi-xip]: vmparam.h
src/sys/arch/next68k/include [uebayasi-xip]: vmparam.h
src/sys/arch/powerpc/include/ibm4xx [uebayasi-xip]: vmparam.h
src/sys/arch/powerpc/include/oea [uebayasi-xip]: vmparam.h
src/sys/arch/sh3/include [uebayasi-xip]: vmparam.h
src/sys/arch/shark/include [uebayasi-xip]: vmparam.h
src/sys/arch/sparc/include [uebayasi-xip]: vmparam.h
src/sys/arch/sparc64/include [uebayasi-xip]: vmparam.h
src/sys/arch/sun2/include [uebayasi-xip]: vmparam.h
src/sys/arch/sun3/include [uebayasi-xip]: vmparam.h
src/sys/arch/vax/include [uebayasi-xip]: vmparam.h
src/sys/arch/x68k/include [uebayasi-xip]: vmparam.h
src/sys/arch/zaurus/include [uebayasi-xip]: vmparam.h
src/sys/uvm [uebayasi-xip]: uvm_page.c
Log Message:
Remove the unfinished code to add a memory segment after uvm_page_init().
It doesn't even compile.
(In the future, we should allocate struct vm_page [] on the added memory
segment for NUMA's sake.)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/acorn26/include/vmparam.h
cvs rdiff -u -r1.21 -r1.21.40.1 src/sys/arch/acorn32/include/vmparam.h
cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/sys/arch/alpha/include/vmparam.h
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/arch/amd64/include/vmparam.h
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/arch/amiga/include/vmparam.h
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/atari/include/vmparam.h
cvs rdiff -u -r1.26 -r1.26.40.1 src/sys/arch/cats/include/vmparam.h
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/arch/cesfic/include/vmparam.h
cvs rdiff -u -r1.25 -r1.25.20.1 src/sys/arch/evbarm/include/vmparam.h
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/arch/hp300/include/vmparam.h
cvs rdiff -u -r1.28 -r1.28.40.1 src/sys/arch/hpcarm/include/vmparam.h
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/arch/hppa/include/vmparam.h
cvs rdiff -u -r1.70.2.1 -r1.70.2.2 src/sys/arch/i386/include/vmparam.h
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/arch/ia64/include/vmparam.h
cvs rdiff -u -r1.3 -r1.3.40.1 src/sys/arch/iyonix/include/vmparam.h
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/luna68k/include/vmparam.h
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/arch/mac68k/include/vmparam.h
cvs rdiff -u -r1.44.2.1 -r1.44.2.2 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/arch/mvme68k/include/vmparam.h
cvs rdiff -u -r1.24 -r1.24.40.1 src/sys/arch/netwinder/include/vmparam.h
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/arch/news68k/include/vmparam.h
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/arch/next68k/include/vmparam.h
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/powerpc/include/ibm4xx/vmparam.h
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/arch/powerpc/include/oea/vmparam.h
cvs rdiff -u -r1.19.2.2 -r1.19.2.3 src/sys/arch/sh3/include/vmparam.h
cvs rdiff -u -r1.16 -r1.16.40.1 src/sys/arch/shark/include/vmparam.h
cvs rdiff -u -r1.40.2.2 -r1.40.2.3 src/sys/arch/sparc/include/vmparam.h
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/arch/sparc64/include/vmparam.h
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/arch/sun2/include/vmparam.h
cvs rdiff -u -r1.33 -r1.33.20.1 src/sys/arch/sun3/include/vmparam.h
cvs rdiff -u -r1.45.2.1 -r1.45.2.2 src/sys/arch/vax/include/vmparam.h
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/arch/x68k/include/vmparam.h
cvs rdiff -u -r1.2 -r1.2.40.1 src/sys/arch/zaurus/include/vmparam.h
cvs rdiff -u -r1.153.2.18 -r1.153.2.19 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.9.2.1
--- src/sys/arch/acorn26/include/vmparam.h:1.9 Fri Mar 6 20:31:46 2009
+++ src/sys/arch/acorn26/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.9 2009/03/06 20:31:46 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.9.2.1 2010/04/26 06:19:03 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.21.40.1
--- src/sys/arch/acorn32/include/vmparam.h:1.21 Thu Oct 25 13:03:03 2007
+++ src/sys/arch/acorn32/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21 2007/10/25 13:03:03 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.21.40.1 2010/04/26 06:19:03 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.2.1 src/sys/arch/alpha/include/vmparam.h:1.33.2.2
--- src/sys/arch/alpha/include/vmparam.h:1.33.2.1 Tue Feb 23 15:27:55 2010
+++ src/sys/arch/alpha/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.33.2.1 2010/02/23 15:27:55 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.33.2.2 2010/04/26 06:19:03 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.2.1 src/sys/arch/amd64/include/vmparam.h:1.22.2.2
--- src/sys/arch/amd64/include/vmparam.h:1.22.2.1 Tue Feb 23 15:27:55 2010
+++ src/sys/arch/amd64/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.22.2.1 2010/02/23 15:27:55 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.22.2.2 2010/04/26 06:19:03 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.39.2.1
--- src/sys/arch/amiga/include/vmparam.h:1.39 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/amiga/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.39 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.39.2.1 2010/04/26 06:19:03 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.26.2.1
--- src/sys/arch/atari/include/vmparam.h:1.26 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/atari/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.26 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.26.2.1 2010/04/26 06:19:03 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.26.40.1
--- src/sys/arch/cats/include/vmparam.h:1.26 Thu Oct 25 13:03:03 2007
+++ src/sys/arch/cats/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.26 2007/10/25 13:03:03 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.26.40.1 2010/04/26 06:19:03 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.12.2.1
--- src/sys/arch/cesfic/include/vmparam.h:1.12 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/cesfic/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.12 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.12.2.1 2010/04/26 06:19:03 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.25.20.1
--- src/sys/arch/evbarm/include/vmparam.h:1.25 Sun Apr 27 18:58:46 2008
+++ src/sys/arch/evbarm/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.25 2008/04/27 18:58:46 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.25.20.1 2010/04/26 06:19:04 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.35.2.1
--- src/sys/arch/hp300/include/vmparam.h:1.35 Tue Dec 8 13:47:26 2009
+++ src/sys/arch/hp300/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.35 2009/12/08 13:47:26 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.35.2.1 2010/04/26 06:19:04 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.28.40.1
--- src/sys/arch/hpcarm/include/vmparam.h:1.28 Thu Oct 25 13:03:04 2007
+++ src/sys/arch/hpcarm/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.28 2007/10/25 13:03:04 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.28.40.1 2010/04/26 06:19:04 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.14.2.1 src/sys/arch/hppa/include/vmparam.h:1.14.2.2
--- src/sys/arch/hppa/include/vmparam.h:1.14.2.1 Tue Feb 23 15:27:55 2010
+++ src/sys/arch/hppa/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.14.2.1 2010/02/23 15:27:55 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.14.2.2 2010/04/26 06:19:04 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 1
#define VM_FREELIST_DEFAULT 0
Index: src/sys/arch/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.70.2.1 src/sys/arch/i386/include/vmparam.h:1.70.2.2
--- src/sys/arch/i386/include/vmparam.h:1.70.2.1 Tue Feb 23 15:27:55 2010
+++ src/sys/arch/i386/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.70.2.1 2010/02/23 15:27:55 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.70.2.2 2010/04/26 06:19:04 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.2.1 src/sys/arch/ia64/include/vmparam.h:1.5.2.2
--- src/sys/arch/ia64/include/vmparam.h:1.5.2.1 Tue Feb 23 15:27:56 2010
+++ src/sys/arch/ia64/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.5.2.1 2010/02/23 15:27:56 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.5.2.2 2010/04/26 06:19:04 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.3.40.1
--- src/sys/arch/iyonix/include/vmparam.h:1.3 Thu Oct 25 13:03:04 2007
+++ src/sys/arch/iyonix/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.3 2007/10/25 13:03:04 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.3.40.1 2010/04/26 06:19:03 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.15 src/sys/arch/luna68k/include/vmparam.h:1.15.2.1
--- src/sys/arch/luna68k/include/vmparam.h:1.15 Fri Dec 11 18:57:44 2009
+++ src/sys/arch/luna68k/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.15 2009/12/11 18:57:44 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.15.2.1 2010/04/26 06:19:04 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -150,7 +150,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.40.2.1
--- src/sys/arch/mac68k/include/vmparam.h:1.40 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/mac68k/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.40 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.40.2.1 2010/04/26 06:19:04 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.2.1 src/sys/arch/mips/include/vmparam.h:1.44.2.2
--- src/sys/arch/mips/include/vmparam.h:1.44.2.1 Tue Feb 23 15:27:56 2010
+++ src/sys/arch/mips/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.44.2.1 2010/02/23 15:27:56 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.44.2.2 2010/04/26 06:19:04 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.31.2.1
--- src/sys/arch/mvme68k/include/vmparam.h:1.31 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/mvme68k/include/vmparam.h Mon Apr 26 06:19:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.31 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.31.2.1 2010/04/26 06:19:04 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.24.40.1
--- src/sys/arch/netwinder/include/vmparam.h:1.24 Thu Oct 25 13:03:05 2007
+++ src/sys/arch/netwinder/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.24 2007/10/25 13:03:05 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.24.40.1 2010/04/26 06:19:05 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.16.2.1
--- src/sys/arch/news68k/include/vmparam.h:1.16 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/news68k/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.16 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.16.2.1 2010/04/26 06:19:05 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.21.2.1
--- src/sys/arch/next68k/include/vmparam.h:1.21 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/next68k/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.21 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.21.2.1 2010/04/26 06:19:05 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/ibm4xx/vmparam.h
diff -u src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.6 src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.6.2.1
--- 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 Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.6 2009/03/06 20:31:51 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.6.2.1 2010/04/26 06:19:05 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.2.1 src/sys/arch/powerpc/include/oea/vmparam.h:1.14.2.2
--- src/sys/arch/powerpc/include/oea/vmparam.h:1.14.2.1 Tue Feb 23 15:27:56 2010
+++ src/sys/arch/powerpc/include/oea/vmparam.h Mon Apr 26 06:19:05 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.2.2 src/sys/arch/sh3/include/vmparam.h:1.19.2.3
--- src/sys/arch/sh3/include/vmparam.h:1.19.2.2 Thu Feb 25 05:13:01 2010
+++ src/sys/arch/sh3/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.19.2.2 2010/02/25 05:13:01 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.19.2.3 2010/04/26 06:19:05 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.16.40.1
--- src/sys/arch/shark/include/vmparam.h:1.16 Thu Oct 25 13:03:05 2007
+++ src/sys/arch/shark/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.16 2007/10/25 13:03:05 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.16.40.1 2010/04/26 06:19:05 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.2.2 src/sys/arch/sparc/include/vmparam.h:1.40.2.3
--- src/sys/arch/sparc/include/vmparam.h:1.40.2.2 Thu Feb 25 05:54:03 2010
+++ src/sys/arch/sparc/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.40.2.2 2010/02/25 05:54:03 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.40.2.3 2010/04/26 06:19:05 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.2.1 src/sys/arch/sparc64/include/vmparam.h:1.30.2.2
--- src/sys/arch/sparc64/include/vmparam.h:1.30.2.1 Tue Feb 23 15:27:56 2010
+++ src/sys/arch/sparc64/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.30.2.1 2010/02/23 15:27:56 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.30.2.2 2010/04/26 06:19:05 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.13.2.1
--- src/sys/arch/sun2/include/vmparam.h:1.13 Fri Mar 6 20:31:53 2009
+++ src/sys/arch/sun2/include/vmparam.h Mon Apr 26 06:19:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.13 2009/03/06 20:31:53 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.13.2.1 2010/04/26 06:19:05 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.33 src/sys/arch/sun3/include/vmparam.h:1.33.20.1
--- src/sys/arch/sun3/include/vmparam.h:1.33 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun3/include/vmparam.h Mon Apr 26 06:19:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.33 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: vmparam.h,v 1.33.20.1 2010/04/26 06:19:06 uebayasi Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,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.2.1 src/sys/arch/vax/include/vmparam.h:1.45.2.2
--- src/sys/arch/vax/include/vmparam.h:1.45.2.1 Tue Feb 23 15:27:57 2010
+++ src/sys/arch/vax/include/vmparam.h Mon Apr 26 06:19:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.45.2.1 2010/02/23 15:27:57 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.45.2.2 2010/04/26 06:19:06 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.31.2.1
--- src/sys/arch/x68k/include/vmparam.h:1.31 Tue Dec 8 13:47:27 2009
+++ src/sys/arch/x68k/include/vmparam.h Mon Apr 26 06:19:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.31 2009/12/08 13:47:27 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.31.2.1 2010/04/26 06:19:06 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.2.40.1
--- src/sys/arch/zaurus/include/vmparam.h:1.2 Thu Oct 25 13:03:05 2007
+++ src/sys/arch/zaurus/include/vmparam.h Mon Apr 26 06:19:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.2 2007/10/25 13:03:05 yamt Exp $ */
+/* $NetBSD: vmparam.h,v 1.2.40.1 2010/04/26 06:19:03 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.153.2.18 src/sys/uvm/uvm_page.c:1.153.2.19
--- src/sys/uvm/uvm_page.c:1.153.2.18 Sun Apr 25 15:23:27 2010
+++ src/sys/uvm/uvm_page.c Mon Apr 26 06:19:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.153.2.18 2010/04/25 15:23:27 uebayasi Exp $ */
+/* $NetBSD: uvm_page.c,v 1.153.2.19 2010/04/26 06:19:06 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.18 2010/04/25 15:23:27 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.19 2010/04/26 06:19:06 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -819,7 +819,7 @@
ps->avail_start = avail_start;
ps->avail_end = avail_end;
/*
- * check to see if this is a "preload" (i.e. uvm_mem_init hasn't been
+ * check to see if this is a "preload" (i.e. uvm_page_init hasn't been
* called yet, so malloc is not available).
*/
for (lcv = 0; lcv < *rnsegs; lcv++) {
@@ -832,8 +832,7 @@
ps->endpg = NULL;
ps->free_list = free_list; /* XXX */
} else {
- uvm_page_physload_common_alloc_pgs(ps, start, end,
- avail_start, avail_end, free_list);
+ panic("uvm_page_physload: tried to add RAM after uvm_page_init");
}
} else {
/* XXX */
@@ -843,56 +842,6 @@
return ps;
}
-/*
- * if VM is already running, attempt to malloc() vm_page structures
- */
-/* XXXUEBS this is super ugly */
-/* XXXUEBS struct vm_page [] should be allocated in the added segment itself
- for NUMA's sake. */
-void
-uvm_page_physload_common_alloc_pgs(struct vm_physseg *ps,
- const paddr_t start, const paddr_t end,
- const paddr_t avail_start, const paddr_t avail_end, const int free_list)
-{
- struct vm_page *pgs;
- psize_t npages;
-
-#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) {
- panic("uvm_page_physload: can not malloc vm_page "
- "structs for segment\n"
- "0x%lx -> 0x%lx\n, start, end);
- }
- /* zero data, init phys_addr, free_list, and free pages */
- memset(pgs, 0, sizeof(struct vm_page) * npages);
- for (lcv = 0, paddr = ptoa(start); lcv < npages;
- lcv++, paddr += PAGE_SIZE) {
-#if 1
- pgs[lcv].phys_addr = paddr;
-#endif
- 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
-
- ps->pgs = pgs;
- ps->endpg = pgs + npages;
- ps->free_list = free_list;
-
- uvmpdpol_reinit();
-}
-
static struct vm_physseg *
uvm_physseg_insert(struct vm_physseg *segs, int nsegs,
const paddr_t start, const paddr_t end)
