tech-kern archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: Autotuning of kern.ipc.shmmaxpgs
On Mon, Feb 23, 2009 at 09:03:24PM +0000, David Brownlee wrote:
> Would there be any sense in writing a test program to try to
> allocate as much SysV shared memory s possible, then get someone
> to test it as a non root user on a vax with the static limit
> completely removed.
Looking more at this, anyone able to kill the system with SysV shared
memory could do the same thing with a normal mmap as well.
Attached is an updated patch that removes the default SHMMAXPGS from the
config files and ensures that the auto-scaling picks up at least 1k
pages. That seems to be the default on all archs currently.
Joerg
Index: arch/acorn26/conf/FOURMEG
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn26/conf/FOURMEG,v
retrieving revision 1.32
diff -u -p -r1.32 FOURMEG
--- arch/acorn26/conf/FOURMEG 14 Feb 2009 10:20:55 -0000 1.32
+++ arch/acorn26/conf/FOURMEG 1 Mar 2009 22:07:16 -0000
@@ -90,7 +90,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: arch/acorn26/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn26/conf/INSTALL,v
retrieving revision 1.26
diff -u -p -r1.26 INSTALL
--- arch/acorn26/conf/INSTALL 14 Feb 2009 10:20:55 -0000 1.26
+++ arch/acorn26/conf/INSTALL 1 Mar 2009 22:07:12 -0000
@@ -88,7 +88,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Miscellaneous kernel options
#options KTRACE # system call tracing, a la ktrace(1)
Index: arch/acorn26/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn26/include/vmparam.h,v
retrieving revision 1.8
diff -u -p -r1.8 vmparam.h
--- arch/acorn26/include/vmparam.h 25 Oct 2007 13:03:03 -0000 1.8
+++ arch/acorn26/include/vmparam.h 1 Mar 2009 22:07:21 -0000
@@ -59,13 +59,6 @@
#endif
/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
-/*
* Override the default pager_map size, there's not enough KVA.
*/
#define PAGER_MAP_DEFAULT_SIZE (1 * 1024 * 1024)
Index: arch/acorn32/conf/EB7500ATX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn32/conf/EB7500ATX,v
retrieving revision 1.35
diff -u -p -r1.35 EB7500ATX
--- arch/acorn32/conf/EB7500ATX 24 Nov 2008 11:41:07 -0000 1.35
+++ arch/acorn32/conf/EB7500ATX 1 Mar 2009 22:07:43 -0000
@@ -127,7 +127,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/acorn32/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn32/conf/GENERIC,v
retrieving revision 1.91
diff -u -p -r1.91 GENERIC
--- arch/acorn32/conf/GENERIC 24 Jan 2009 05:06:05 -0000 1.91
+++ arch/acorn32/conf/GENERIC 1 Mar 2009 22:07:40 -0000
@@ -132,7 +132,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/acorn32/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn32/conf/INSTALL,v
retrieving revision 1.52
diff -u -p -r1.52 INSTALL
--- arch/acorn32/conf/INSTALL 6 Feb 2009 18:50:26 -0000 1.52
+++ arch/acorn32/conf/INSTALL 1 Mar 2009 22:07:36 -0000
@@ -119,7 +119,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/acorn32/conf/LOWMEM_WSCONS
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn32/conf/LOWMEM_WSCONS,v
retrieving revision 1.50
diff -u -p -r1.50 LOWMEM_WSCONS
--- arch/acorn32/conf/LOWMEM_WSCONS 12 Nov 2008 12:35:55 -0000 1.50
+++ arch/acorn32/conf/LOWMEM_WSCONS 1 Mar 2009 22:07:32 -0000
@@ -100,7 +100,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/acorn32/conf/NC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn32/conf/NC,v
retrieving revision 1.48
diff -u -p -r1.48 NC
--- arch/acorn32/conf/NC 12 Nov 2008 12:35:55 -0000 1.48
+++ arch/acorn32/conf/NC 1 Mar 2009 22:07:29 -0000
@@ -94,7 +94,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/algor/conf/P4032
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P4032,v
retrieving revision 1.50
diff -u -p -r1.50 P4032
--- arch/algor/conf/P4032 24 Nov 2008 11:41:07 -0000 1.50
+++ arch/algor/conf/P4032 1 Mar 2009 22:07:53 -0000
@@ -83,7 +83,6 @@ options SYSVSEM
# System V-like shared memory
options SYSVSHM
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Loadable Kernel Modules
Index: arch/algor/conf/P5064
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P5064,v
retrieving revision 1.56
diff -u -p -r1.56 P5064
--- arch/algor/conf/P5064 24 Nov 2008 11:41:07 -0000 1.56
+++ arch/algor/conf/P5064 1 Mar 2009 22:07:50 -0000
@@ -78,7 +78,6 @@ options SYSVSEM
# System V-like shared memory
options SYSVSHM
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Loadable Kernel Modules
Index: arch/algor/conf/P6032
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P6032,v
retrieving revision 1.49
diff -u -p -r1.49 P6032
--- arch/algor/conf/P6032 24 Nov 2008 11:41:07 -0000 1.49
+++ arch/algor/conf/P6032 1 Mar 2009 22:07:47 -0000
@@ -78,7 +78,6 @@ options SYSVSEM
# System V-like shared memory
options SYSVSHM
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Loadable Kernel Modules
Index: arch/alpha/conf/BASIL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/alpha/conf/BASIL,v
retrieving revision 1.51
diff -u -p -r1.51 BASIL
--- arch/alpha/conf/BASIL 24 Nov 2008 11:41:07 -0000 1.51
+++ arch/alpha/conf/BASIL 1 Mar 2009 22:07:59 -0000
@@ -96,7 +96,6 @@ options SYSVSEM
# System V-like shared memory
options SYSVSHM
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Loadable Kernel Modules
Index: arch/alpha/conf/FRAU-FARBISSINA
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/alpha/conf/FRAU-FARBISSINA,v
retrieving revision 1.55
diff -u -p -r1.55 FRAU-FARBISSINA
--- arch/alpha/conf/FRAU-FARBISSINA 24 Nov 2008 11:41:07 -0000 1.55
+++ arch/alpha/conf/FRAU-FARBISSINA 1 Mar 2009 22:07:06 -0000
@@ -93,7 +93,6 @@ options SYSVSEM
# System V-like shared memory
options SYSVSHM
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Loadable Kernel Modules
Index: arch/alpha/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/alpha/include/vmparam.h,v
retrieving revision 1.32
diff -u -p -r1.32 vmparam.h
--- arch/alpha/include/vmparam.h 10 Mar 2008 13:36:22 -0000 1.32
+++ arch/alpha/include/vmparam.h 1 Mar 2009 22:08:06 -0000
@@ -129,14 +129,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 8mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/amd64/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/amd64/include/vmparam.h,v
retrieving revision 1.20
diff -u -p -r1.20 vmparam.h
--- arch/amd64/include/vmparam.h 13 Dec 2008 14:07:10 -0000 1.20
+++ arch/amd64/include/vmparam.h 1 Mar 2009 22:03:29 -0000
@@ -105,13 +105,6 @@
#endif
/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 2048
-#endif
-
-/*
* Size of User Raw I/O map
*/
#define USRIOSIZE 300
Index: arch/amiga/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/amiga/include/vmparam.h,v
retrieving revision 1.36
diff -u -p -r1.36 vmparam.h
--- arch/amiga/include/vmparam.h 17 Oct 2007 19:53:26 -0000 1.36
+++ arch/amiga/include/vmparam.h 1 Mar 2009 22:06:55 -0000
@@ -139,14 +139,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS (1 * NPTEPG) /* 16mb */
-#endif
-
-/*
* user/kernel map constants
*/
#define VM_MIN_ADDRESS ((vaddr_t)0) /* user min */
Index: arch/arc/conf/ARCTIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arc/conf/ARCTIC,v
retrieving revision 1.50
diff -u -p -r1.50 ARCTIC
--- arch/arc/conf/ARCTIC 24 Nov 2008 11:41:08 -0000 1.50
+++ arch/arc/conf/ARCTIC 1 Mar 2009 22:08:52 -0000
@@ -28,8 +28,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/arc/conf/M403
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arc/conf/M403,v
retrieving revision 1.47
diff -u -p -r1.47 M403
--- arch/arc/conf/M403 24 Nov 2008 11:41:08 -0000 1.47
+++ arch/arc/conf/M403 1 Mar 2009 22:08:44 -0000
@@ -22,8 +22,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
Index: arch/arc/conf/MIMORI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arc/conf/MIMORI,v
retrieving revision 1.51
diff -u -p -r1.51 MIMORI
--- arch/arc/conf/MIMORI 24 Nov 2008 11:41:08 -0000 1.51
+++ arch/arc/conf/MIMORI 1 Mar 2009 22:08:39 -0000
@@ -23,8 +23,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/arc/conf/PICA
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arc/conf/PICA,v
retrieving revision 1.63
diff -u -p -r1.63 PICA
--- arch/arc/conf/PICA 24 Nov 2008 11:41:08 -0000 1.63
+++ arch/arc/conf/PICA 1 Mar 2009 22:08:26 -0000
@@ -22,8 +22,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/arc/conf/RPC44
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arc/conf/RPC44,v
retrieving revision 1.33
diff -u -p -r1.33 RPC44
--- arch/arc/conf/RPC44 24 Nov 2008 11:41:08 -0000 1.33
+++ arch/arc/conf/RPC44 1 Mar 2009 22:07:02 -0000
@@ -43,8 +43,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/arm/include/arm32/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arm/include/arm32/vmparam.h,v
retrieving revision 1.23
diff -u -p -r1.23 vmparam.h
--- arch/arm/include/arm32/vmparam.h 6 Aug 2008 19:13:45 -0000 1.23
+++ arch/arm/include/arm32/vmparam.h 1 Mar 2009 22:08:58 -0000
@@ -70,13 +70,6 @@
#endif
/*
- * Size of SysV shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
-/*
* While the ARM architecture defines Section mappings, large pages,
* and small pages, the standard page size is (and will always be) 4K.
*/
Index: arch/atari/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/atari/include/vmparam.h,v
retrieving revision 1.22
diff -u -p -r1.22 vmparam.h
--- arch/atari/include/vmparam.h 1 Jan 2009 04:10:25 -0000 1.22
+++ arch/atari/include/vmparam.h 1 Mar 2009 22:09:07 -0000
@@ -138,14 +138,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS (1 * NPTEPG) /* 16mb */
-#endif
-
-/*
* user/kernel map constants
*/
#define VM_MIN_ADDRESS ((vaddr_t)0)
Index: arch/cats/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/cats/conf/INSTALL,v
retrieving revision 1.72
diff -u -p -r1.72 INSTALL
--- arch/cats/conf/INSTALL 6 Feb 2009 18:50:26 -0000 1.72
+++ arch/cats/conf/INSTALL 1 Mar 2009 22:09:14 -0000
@@ -102,7 +102,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/cesfic/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/cesfic/include/vmparam.h,v
retrieving revision 1.9
diff -u -p -r1.9 vmparam.h
--- arch/cesfic/include/vmparam.h 11 Dec 2005 12:17:05 -0000 1.9
+++ arch/cesfic/include/vmparam.h 1 Mar 2009 22:09:21 -0000
@@ -149,14 +149,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/cobalt/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/cobalt/conf/INSTALL,v
retrieving revision 1.39
diff -u -p -r1.39 INSTALL
--- arch/cobalt/conf/INSTALL 24 Nov 2008 11:41:09 -0000 1.39
+++ arch/cobalt/conf/INSTALL 1 Mar 2009 22:09:24 -0000
@@ -26,7 +26,6 @@ maxusers 32
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
#options NTP # network time protocol
#options USERCONF # userconf(4) support
Index: arch/evbarm/conf/ADI_BRH
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ADI_BRH,v
retrieving revision 1.45
diff -u -p -r1.45 ADI_BRH
--- arch/evbarm/conf/ADI_BRH 24 Nov 2008 11:41:09 -0000 1.45
+++ arch/evbarm/conf/ADI_BRH 1 Mar 2009 22:10:50 -0000
@@ -102,7 +102,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/ARMADILLO210
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ARMADILLO210,v
retrieving revision 1.11
diff -u -p -r1.11 ARMADILLO210
--- arch/evbarm/conf/ARMADILLO210 6 Feb 2009 18:50:26 -0000 1.11
+++ arch/evbarm/conf/ARMADILLO210 1 Mar 2009 22:10:47 -0000
@@ -93,7 +93,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/evbarm/conf/ARMADILLO9
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ARMADILLO9,v
retrieving revision 1.23
diff -u -p -r1.23 ARMADILLO9
--- arch/evbarm/conf/ARMADILLO9 24 Nov 2008 11:41:09 -0000 1.23
+++ arch/evbarm/conf/ARMADILLO9 1 Mar 2009 22:10:44 -0000
@@ -93,7 +93,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/evbarm/conf/BEAGLEBOARD
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/BEAGLEBOARD,v
retrieving revision 1.4
diff -u -p -r1.4 BEAGLEBOARD
--- arch/evbarm/conf/BEAGLEBOARD 24 Nov 2008 11:41:09 -0000 1.4
+++ arch/evbarm/conf/BEAGLEBOARD 1 Mar 2009 22:10:42 -0000
@@ -110,7 +110,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/CP3100
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/CP3100,v
retrieving revision 1.12
diff -u -p -r1.12 CP3100
--- arch/evbarm/conf/CP3100 14 Dec 2008 23:07:22 -0000 1.12
+++ arch/evbarm/conf/CP3100 1 Mar 2009 22:10:39 -0000
@@ -108,7 +108,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=2048 # 2048 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/evbarm/conf/GEMINI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GEMINI,v
retrieving revision 1.10
diff -u -p -r1.10 GEMINI
--- arch/evbarm/conf/GEMINI 24 Nov 2008 11:41:09 -0000 1.10
+++ arch/evbarm/conf/GEMINI 1 Mar 2009 22:10:37 -0000
@@ -100,7 +100,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/GEMINI_MASTER
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GEMINI_MASTER,v
retrieving revision 1.9
diff -u -p -r1.9 GEMINI_MASTER
--- arch/evbarm/conf/GEMINI_MASTER 6 Feb 2009 18:50:26 -0000 1.9
+++ arch/evbarm/conf/GEMINI_MASTER 1 Mar 2009 22:10:35 -0000
@@ -101,7 +101,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/GEMINI_SLAVE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GEMINI_SLAVE,v
retrieving revision 1.9
diff -u -p -r1.9 GEMINI_SLAVE
--- arch/evbarm/conf/GEMINI_SLAVE 6 Feb 2009 18:50:26 -0000 1.9
+++ arch/evbarm/conf/GEMINI_SLAVE 1 Mar 2009 22:10:32 -0000
@@ -100,7 +100,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/GUMSTIX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GUMSTIX,v
retrieving revision 1.34
diff -u -p -r1.34 GUMSTIX
--- arch/evbarm/conf/GUMSTIX 6 Feb 2009 18:50:27 -0000 1.34
+++ arch/evbarm/conf/GUMSTIX 1 Mar 2009 22:10:30 -0000
@@ -119,7 +119,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/evbarm/conf/HDL_G
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/HDL_G,v
retrieving revision 1.13
diff -u -p -r1.13 HDL_G
--- arch/evbarm/conf/HDL_G 24 Nov 2008 11:41:09 -0000 1.13
+++ arch/evbarm/conf/HDL_G 1 Mar 2009 22:10:28 -0000
@@ -111,7 +111,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/evbarm/conf/IMX31LITE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IMX31LITE,v
retrieving revision 1.6
diff -u -p -r1.6 IMX31LITE
--- arch/evbarm/conf/IMX31LITE 24 Nov 2008 11:41:09 -0000 1.6
+++ arch/evbarm/conf/IMX31LITE 1 Mar 2009 22:10:25 -0000
@@ -100,7 +100,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/INTEGRATOR
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/INTEGRATOR,v
retrieving revision 1.54
diff -u -p -r1.54 INTEGRATOR
--- arch/evbarm/conf/INTEGRATOR 24 Nov 2008 11:41:09 -0000 1.54
+++ arch/evbarm/conf/INTEGRATOR 1 Mar 2009 22:10:22 -0000
@@ -102,7 +102,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/IQ31244
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IQ31244,v
retrieving revision 1.44
diff -u -p -r1.44 IQ31244
--- arch/evbarm/conf/IQ31244 9 Jan 2009 17:21:19 -0000 1.44
+++ arch/evbarm/conf/IQ31244 1 Mar 2009 22:10:20 -0000
@@ -102,7 +102,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/IQ80310
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IQ80310,v
retrieving revision 1.63
diff -u -p -r1.63 IQ80310
--- arch/evbarm/conf/IQ80310 24 Nov 2008 11:41:09 -0000 1.63
+++ arch/evbarm/conf/IQ80310 1 Mar 2009 22:10:17 -0000
@@ -102,7 +102,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/IQ80321
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IQ80321,v
retrieving revision 1.58
diff -u -p -r1.58 IQ80321
--- arch/evbarm/conf/IQ80321 24 Nov 2008 11:41:09 -0000 1.58
+++ arch/evbarm/conf/IQ80321 1 Mar 2009 22:10:15 -0000
@@ -102,7 +102,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/IXDP425
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IXDP425,v
retrieving revision 1.26
diff -u -p -r1.26 IXDP425
--- arch/evbarm/conf/IXDP425 24 Nov 2008 11:41:09 -0000 1.26
+++ arch/evbarm/conf/IXDP425 1 Mar 2009 22:10:14 -0000
@@ -106,7 +106,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/IXM1200
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IXM1200,v
retrieving revision 1.37
diff -u -p -r1.37 IXM1200
--- arch/evbarm/conf/IXM1200 24 Nov 2008 11:41:09 -0000 1.37
+++ arch/evbarm/conf/IXM1200 1 Mar 2009 22:10:11 -0000
@@ -101,7 +101,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/LUBBOCK
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/LUBBOCK,v
retrieving revision 1.30
diff -u -p -r1.30 LUBBOCK
--- arch/evbarm/conf/LUBBOCK 3 Jan 2009 17:46:05 -0000 1.30
+++ arch/evbarm/conf/LUBBOCK 1 Mar 2009 22:10:08 -0000
@@ -100,7 +100,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/MPCSA_GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/MPCSA_GENERIC,v
retrieving revision 1.9
diff -u -p -r1.9 MPCSA_GENERIC
--- arch/evbarm/conf/MPCSA_GENERIC 3 Jan 2009 17:46:05 -0000 1.9
+++ arch/evbarm/conf/MPCSA_GENERIC 1 Mar 2009 22:10:06 -0000
@@ -64,7 +64,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/evbarm/conf/NAPPI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/NAPPI,v
retrieving revision 1.31
diff -u -p -r1.31 NAPPI
--- arch/evbarm/conf/NAPPI 24 Nov 2008 11:41:10 -0000 1.31
+++ arch/evbarm/conf/NAPPI 1 Mar 2009 22:10:03 -0000
@@ -101,7 +101,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Console options.
#options CONSPEED=38400 # Console speed
Index: arch/evbarm/conf/NSLU2
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/NSLU2,v
retrieving revision 1.13
diff -u -p -r1.13 NSLU2
--- arch/evbarm/conf/NSLU2 24 Nov 2008 11:41:10 -0000 1.13
+++ arch/evbarm/conf/NSLU2 1 Mar 2009 22:10:01 -0000
@@ -105,7 +105,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/OSK5912
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/OSK5912,v
retrieving revision 1.6
diff -u -p -r1.6 OSK5912
--- arch/evbarm/conf/OSK5912 24 Nov 2008 11:41:10 -0000 1.6
+++ arch/evbarm/conf/OSK5912 1 Mar 2009 22:09:58 -0000
@@ -98,7 +98,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/SMDK2410
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/SMDK2410,v
retrieving revision 1.36
diff -u -p -r1.36 SMDK2410
--- arch/evbarm/conf/SMDK2410 24 Nov 2008 11:41:10 -0000 1.36
+++ arch/evbarm/conf/SMDK2410 1 Mar 2009 22:09:55 -0000
@@ -120,7 +120,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: arch/evbarm/conf/SMDK2800
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/SMDK2800,v
retrieving revision 1.37
diff -u -p -r1.37 SMDK2800
--- arch/evbarm/conf/SMDK2800 24 Nov 2008 11:41:10 -0000 1.37
+++ arch/evbarm/conf/SMDK2800 1 Mar 2009 22:09:53 -0000
@@ -109,7 +109,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: arch/evbarm/conf/TEAMASA_NPWR
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TEAMASA_NPWR,v
retrieving revision 1.59
diff -u -p -r1.59 TEAMASA_NPWR
--- arch/evbarm/conf/TEAMASA_NPWR 24 Nov 2008 11:41:10 -0000 1.59
+++ arch/evbarm/conf/TEAMASA_NPWR 1 Mar 2009 22:09:50 -0000
@@ -105,7 +105,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/TEAMASA_NPWR_FC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC,v
retrieving revision 1.24
diff -u -p -r1.24 TEAMASA_NPWR_FC
--- arch/evbarm/conf/TEAMASA_NPWR_FC 24 Nov 2008 11:41:10 -0000 1.24
+++ arch/evbarm/conf/TEAMASA_NPWR_FC 1 Mar 2009 22:09:48 -0000
@@ -103,7 +103,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/TISDP2420
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TISDP2420,v
retrieving revision 1.8
diff -u -p -r1.8 TISDP2420
--- arch/evbarm/conf/TISDP2420 24 Nov 2008 11:41:10 -0000 1.8
+++ arch/evbarm/conf/TISDP2420 1 Mar 2009 22:09:44 -0000
@@ -110,7 +110,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/TISDP2430
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TISDP2430,v
retrieving revision 1.8
diff -u -p -r1.8 TISDP2430
--- arch/evbarm/conf/TISDP2430 24 Nov 2008 11:41:10 -0000 1.8
+++ arch/evbarm/conf/TISDP2430 1 Mar 2009 22:09:42 -0000
@@ -109,7 +109,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/TS7200
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TS7200,v
retrieving revision 1.37
diff -u -p -r1.37 TS7200
--- arch/evbarm/conf/TS7200 27 Feb 2009 03:13:55 -0000 1.37
+++ arch/evbarm/conf/TS7200 1 Mar 2009 22:09:40 -0000
@@ -107,7 +107,6 @@ options SEMMNS=60 # number of semaphore
options SEMUME=10 # max number of undo entries per process
options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/TWINTAIL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TWINTAIL,v
retrieving revision 1.29
diff -u -p -r1.29 TWINTAIL
--- arch/evbarm/conf/TWINTAIL 3 Jan 2009 17:46:05 -0000 1.29
+++ arch/evbarm/conf/TWINTAIL 1 Mar 2009 22:09:37 -0000
@@ -104,7 +104,6 @@ options COMPAT_16 # NetBSD 1.6 compatib
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/VIPER
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/VIPER,v
retrieving revision 1.15
diff -u -p -r1.15 VIPER
--- arch/evbarm/conf/VIPER 24 Nov 2008 11:41:10 -0000 1.15
+++ arch/evbarm/conf/VIPER 1 Mar 2009 22:09:34 -0000
@@ -97,7 +97,6 @@ options SEMMNS=60 # number of semaphore
options SEMUME=10 # max number of undo entries per process
options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbarm/conf/ZAO425
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ZAO425,v
retrieving revision 1.34
diff -u -p -r1.34 ZAO425
--- arch/evbarm/conf/ZAO425 24 Nov 2008 11:41:10 -0000 1.34
+++ arch/evbarm/conf/ZAO425 1 Mar 2009 22:09:31 -0000
@@ -106,7 +106,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/evbmips/conf/ALCHEMY
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/ALCHEMY,v
retrieving revision 1.22
diff -u -p -r1.22 ALCHEMY
--- arch/evbmips/conf/ALCHEMY 24 Nov 2008 11:41:10 -0000 1.22
+++ arch/evbmips/conf/ALCHEMY 1 Mar 2009 22:11:03 -0000
@@ -37,7 +37,6 @@ options KTRACE # system call tracing s
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options NTP # network time protocol
# Debugging options
Index: arch/evbmips/conf/AP30
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/AP30,v
retrieving revision 1.12
diff -u -p -r1.12 AP30
--- arch/evbmips/conf/AP30 24 Nov 2008 11:41:10 -0000 1.12
+++ arch/evbmips/conf/AP30 1 Mar 2009 22:11:00 -0000
@@ -34,7 +34,6 @@ options SOSEND_NO_LOAN
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options NTP # network time protocol
# Debugging options
Index: arch/evbmips/conf/MALTA
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/MALTA,v
retrieving revision 1.50
diff -u -p -r1.50 MALTA
--- arch/evbmips/conf/MALTA 24 Nov 2008 11:41:10 -0000 1.50
+++ arch/evbmips/conf/MALTA 1 Mar 2009 22:10:58 -0000
@@ -25,7 +25,6 @@ options KTRACE # system call tracing s
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options NTP # network time protocol
# Debugging options
Index: arch/evbmips/conf/MERAKI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/MERAKI,v
retrieving revision 1.8
diff -u -p -r1.8 MERAKI
--- arch/evbmips/conf/MERAKI 24 Nov 2008 11:41:10 -0000 1.8
+++ arch/evbmips/conf/MERAKI 1 Mar 2009 22:10:57 -0000
@@ -34,7 +34,6 @@ options SOSEND_NO_LOAN
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options NTP # network time protocol
# Debugging options
Index: arch/evbmips/conf/WGT624V3
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/WGT624V3,v
retrieving revision 1.5
diff -u -p -r1.5 WGT624V3
--- arch/evbmips/conf/WGT624V3 24 Nov 2008 11:41:10 -0000 1.5
+++ arch/evbmips/conf/WGT624V3 1 Mar 2009 22:10:56 -0000
@@ -35,7 +35,6 @@ options SOSEND_NO_LOAN
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options NTP # network time protocol
# Debugging options
Index: arch/evbppc/conf/EV64260
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/EV64260,v
retrieving revision 1.38
diff -u -p -r1.38 EV64260
--- arch/evbppc/conf/EV64260 24 Nov 2008 11:41:10 -0000 1.38
+++ arch/evbppc/conf/EV64260 1 Mar 2009 22:11:23 -0000
@@ -44,8 +44,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/EXPLORA451
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/EXPLORA451,v
retrieving revision 1.37
diff -u -p -r1.37 EXPLORA451
--- arch/evbppc/conf/EXPLORA451 24 Nov 2008 11:41:11 -0000 1.37
+++ arch/evbppc/conf/EXPLORA451 1 Mar 2009 22:11:22 -0000
@@ -33,8 +33,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/OPENBLOCKS200
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/OPENBLOCKS200,v
retrieving revision 1.21
diff -u -p -r1.21 OPENBLOCKS200
--- arch/evbppc/conf/OPENBLOCKS200 24 Nov 2008 11:41:11 -0000 1.21
+++ arch/evbppc/conf/OPENBLOCKS200 1 Mar 2009 22:11:20 -0000
@@ -28,8 +28,6 @@ maxusers 32
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/PMPPC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/PMPPC,v
retrieving revision 1.7
diff -u -p -r1.7 PMPPC
--- arch/evbppc/conf/PMPPC 24 Nov 2008 11:41:11 -0000 1.7
+++ arch/evbppc/conf/PMPPC 1 Mar 2009 22:11:18 -0000
@@ -22,8 +22,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/VIRTEX_DFC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/VIRTEX_DFC,v
retrieving revision 1.5
diff -u -p -r1.5 VIRTEX_DFC
--- arch/evbppc/conf/VIRTEX_DFC 24 Nov 2008 11:41:11 -0000 1.5
+++ arch/evbppc/conf/VIRTEX_DFC 1 Mar 2009 22:11:16 -0000
@@ -40,8 +40,6 @@ options KTRACE # system call tracing v
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/VIRTEX_GSRD1
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/VIRTEX_GSRD1,v
retrieving revision 1.5
diff -u -p -r1.5 VIRTEX_GSRD1
--- arch/evbppc/conf/VIRTEX_GSRD1 24 Nov 2008 11:41:11 -0000 1.5
+++ arch/evbppc/conf/VIRTEX_GSRD1 1 Mar 2009 22:11:13 -0000
@@ -34,8 +34,6 @@ options UVMHIST
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/VIRTEX_GSRD2
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/VIRTEX_GSRD2,v
retrieving revision 1.6
diff -u -p -r1.6 VIRTEX_GSRD2
--- arch/evbppc/conf/VIRTEX_GSRD2 24 Nov 2008 11:41:11 -0000 1.6
+++ arch/evbppc/conf/VIRTEX_GSRD2 1 Mar 2009 22:11:10 -0000
@@ -42,8 +42,6 @@ options CONS_ADDR=0x010000 # offset in
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/evbppc/conf/WALNUT
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/WALNUT,v
retrieving revision 1.39
diff -u -p -r1.39 WALNUT
--- arch/evbppc/conf/WALNUT 24 Nov 2008 11:41:11 -0000 1.39
+++ arch/evbppc/conf/WALNUT 1 Mar 2009 22:11:12 -0000
@@ -28,8 +28,6 @@ options KTRACE # system call tracing v
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/hp300/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/hp300/include/vmparam.h,v
retrieving revision 1.32
diff -u -p -r1.32 vmparam.h
--- arch/hp300/include/vmparam.h 11 Dec 2005 12:17:19 -0000 1.32
+++ arch/hp300/include/vmparam.h 1 Mar 2009 22:11:30 -0000
@@ -139,14 +139,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* External IO space map size.
* By default we make it large enough to map up to 3 DIO-II devices and
* the complete DIO space. For a 320-only configuration (which has no
Index: arch/hpcarm/conf/IPAQ
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/hpcarm/conf/IPAQ,v
retrieving revision 1.56
diff -u -p -r1.56 IPAQ
--- arch/hpcarm/conf/IPAQ 24 Nov 2008 11:41:11 -0000 1.56
+++ arch/hpcarm/conf/IPAQ 1 Mar 2009 22:11:38 -0000
@@ -95,7 +95,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/hpcarm/conf/JORNADA720
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/hpcarm/conf/JORNADA720,v
retrieving revision 1.73
diff -u -p -r1.73 JORNADA720
--- arch/hpcarm/conf/JORNADA720 3 Jan 2009 17:48:42 -0000 1.73
+++ arch/hpcarm/conf/JORNADA720 1 Mar 2009 22:11:37 -0000
@@ -99,7 +99,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/hpcarm/conf/JORNADA820
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/hpcarm/conf/JORNADA820,v
retrieving revision 1.14
diff -u -p -r1.14 JORNADA820
--- arch/hpcarm/conf/JORNADA820 24 Nov 2008 11:41:11 -0000 1.14
+++ arch/hpcarm/conf/JORNADA820 1 Mar 2009 22:11:34 -0000
@@ -97,7 +97,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/hppa/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/hppa/include/vmparam.h,v
retrieving revision 1.12
diff -u -p -r1.12 vmparam.h
--- arch/hppa/include/vmparam.h 5 Feb 2008 10:10:21 -0000 1.12
+++ arch/hppa/include/vmparam.h 1 Mar 2009 22:11:44 -0000
@@ -70,14 +70,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS ((1024*1024*10)/PAGE_SIZE) /* 10mb */
-#endif
-
-/*
* The time for a process to be blocked before being very swappable.
* This is a number of seconds which the system takes as being a non-trivial
* amount of real time. You probably shouldn't change this;
Index: arch/i386/conf/ALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/ALL,v
retrieving revision 1.194
diff -u -p -r1.194 ALL
--- arch/i386/conf/ALL 27 Feb 2009 23:37:20 -0000 1.194
+++ arch/i386/conf/ALL 1 Mar 2009 22:12:04 -0000
@@ -84,7 +84,6 @@ options SEMMNS=60 # number of semaphore
options SEMUME=10 # max number of undo entries per process
options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=2048 # 2048 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
options MODULAR # new modules framework
Index: arch/i386/conf/GENERIC_TINY
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/GENERIC_TINY,v
retrieving revision 1.117
diff -u -p -r1.117 GENERIC_TINY
--- arch/i386/conf/GENERIC_TINY 24 Jan 2009 05:06:06 -0000 1.117
+++ arch/i386/conf/GENERIC_TINY 1 Mar 2009 22:12:02 -0000
@@ -40,7 +40,6 @@ options RTC_OFFSET=0 # hardware clock i
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
options NMBCLUSTERS=256
Index: arch/i386/conf/INSTALL_FLOPPY
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/INSTALL_FLOPPY,v
retrieving revision 1.4
diff -u -p -r1.4 INSTALL_FLOPPY
--- arch/i386/conf/INSTALL_FLOPPY 6 Feb 2009 18:50:27 -0000 1.4
+++ arch/i386/conf/INSTALL_FLOPPY 1 Mar 2009 22:11:58 -0000
@@ -57,8 +57,6 @@ options RTC_OFFSET=0 # hardware clock i
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
-
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/i386/conf/INSTALL_TINY
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/INSTALL_TINY,v
retrieving revision 1.123
diff -u -p -r1.123 INSTALL_TINY
--- arch/i386/conf/INSTALL_TINY 6 Feb 2009 18:50:27 -0000 1.123
+++ arch/i386/conf/INSTALL_TINY 1 Mar 2009 22:11:57 -0000
@@ -48,8 +48,6 @@ options RTC_OFFSET=0 # hardware clock i
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
-
#options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/i386/conf/NET4501
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/NET4501,v
retrieving revision 1.66
diff -u -p -r1.66 NET4501
--- arch/i386/conf/NET4501 8 Dec 2008 19:27:50 -0000 1.66
+++ arch/i386/conf/NET4501 1 Mar 2009 22:11:54 -0000
@@ -61,8 +61,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/i386/conf/XEN2_DOM0
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/XEN2_DOM0,v
retrieving revision 1.55
diff -u -p -r1.55 XEN2_DOM0
--- arch/i386/conf/XEN2_DOM0 24 Nov 2008 11:41:12 -0000 1.55
+++ arch/i386/conf/XEN2_DOM0 1 Mar 2009 22:11:51 -0000
@@ -41,7 +41,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/i386/conf/XEN2_DOMU
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/conf/XEN2_DOMU,v
retrieving revision 1.21
diff -u -p -r1.21 XEN2_DOMU
--- arch/i386/conf/XEN2_DOMU 24 Nov 2008 11:41:12 -0000 1.21
+++ arch/i386/conf/XEN2_DOMU 1 Mar 2009 22:11:50 -0000
@@ -38,7 +38,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=2048 # 2048 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/i386/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/include/vmparam.h,v
retrieving revision 1.69
diff -u -p -r1.69 vmparam.h
--- arch/i386/include/vmparam.h 13 Dec 2008 14:07:10 -0000 1.69
+++ arch/i386/include/vmparam.h 1 Mar 2009 22:12:11 -0000
@@ -86,13 +86,6 @@
#define I386_MAX_EXE_ADDR (USRSTACK - MAXSSIZ)
/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 2048
-#endif
-
-/*
* Size of User Raw I/O map
*/
#define USRIOSIZE 300
Index: arch/luna68k/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/luna68k/include/vmparam.h,v
retrieving revision 1.11
diff -u -p -r1.11 vmparam.h
--- arch/luna68k/include/vmparam.h 11 Dec 2005 12:17:52 -0000 1.11
+++ arch/luna68k/include/vmparam.h 1 Mar 2009 22:12:17 -0000
@@ -126,14 +126,6 @@
#define USRIOSIZE (1 * NPTEPG) /* 4mb */
#endif
-/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 8mb */
-#endif
-
/*
* Mach derived constants
*/
Index: arch/mac68k/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mac68k/include/vmparam.h,v
retrieving revision 1.37
diff -u -p -r1.37 vmparam.h
--- arch/mac68k/include/vmparam.h 10 Jan 2009 11:28:47 -0000 1.37
+++ arch/mac68k/include/vmparam.h 1 Mar 2009 22:12:23 -0000
@@ -167,14 +167,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/macppc/conf/MAMBO
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/macppc/conf/MAMBO,v
retrieving revision 1.8
diff -u -p -r1.8 MAMBO
--- arch/macppc/conf/MAMBO 6 Feb 2009 18:50:28 -0000 1.8
+++ arch/macppc/conf/MAMBO 1 Mar 2009 22:12:28 -0000
@@ -26,7 +26,6 @@ options SYSVSEM # System V semaphores
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/macppc/conf/POWERMAC_G5
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/macppc/conf/POWERMAC_G5,v
retrieving revision 1.9
diff -u -p -r1.9 POWERMAC_G5
--- arch/macppc/conf/POWERMAC_G5 6 Feb 2009 18:50:28 -0000 1.9
+++ arch/macppc/conf/POWERMAC_G5 1 Mar 2009 22:12:26 -0000
@@ -23,7 +23,6 @@ options SYSVSEM # System V semaphores
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/mips/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mips/include/vmparam.h,v
retrieving revision 1.41
diff -u -p -r1.41 vmparam.h
--- arch/mips/include/vmparam.h 26 Dec 2007 16:01:34 -0000 1.41
+++ arch/mips/include/vmparam.h 1 Mar 2009 22:12:35 -0000
@@ -131,14 +131,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/mipsco/conf/RC3230
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mipsco/conf/RC3230,v
retrieving revision 1.35
diff -u -p -r1.35 RC3230
--- arch/mipsco/conf/RC3230 12 Nov 2008 12:36:03 -0000 1.35
+++ arch/mipsco/conf/RC3230 1 Mar 2009 22:12:40 -0000
@@ -14,7 +14,6 @@ options KTRACE # system call tracing
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options NTP # network time protocol
options HZ=25
options USERCONF # userconf(4) support
Index: arch/mmeye/conf/MMTA
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mmeye/conf/MMTA,v
retrieving revision 1.39
diff -u -p -r1.39 MMTA
--- arch/mmeye/conf/MMTA 12 Nov 2008 12:36:04 -0000 1.39
+++ arch/mmeye/conf/MMTA 1 Mar 2009 22:12:48 -0000
@@ -32,8 +32,6 @@ options HZ=50 # clock interrupt genera
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
Index: arch/mmeye/conf/MMTAICE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mmeye/conf/MMTAICE,v
retrieving revision 1.41
diff -u -p -r1.41 MMTAICE
--- arch/mmeye/conf/MMTAICE 12 Nov 2008 12:36:04 -0000 1.41
+++ arch/mmeye/conf/MMTAICE 1 Mar 2009 22:12:47 -0000
@@ -62,8 +62,6 @@ options HZ=10 # clock interrupt genera
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/mmeye/conf/MMTAROMNEW
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mmeye/conf/MMTAROMNEW,v
retrieving revision 1.40
diff -u -p -r1.40 MMTAROMNEW
--- arch/mmeye/conf/MMTAROMNEW 12 Nov 2008 12:36:04 -0000 1.40
+++ arch/mmeye/conf/MMTAROMNEW 1 Mar 2009 22:12:45 -0000
@@ -41,8 +41,6 @@ options HZ=10 # clock interrupt genera
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
-
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/mvme68k/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mvme68k/include/vmparam.h,v
retrieving revision 1.28
diff -u -p -r1.28 vmparam.h
--- arch/mvme68k/include/vmparam.h 25 Oct 2007 13:03:04 -0000 1.28
+++ arch/mvme68k/include/vmparam.h 1 Mar 2009 22:12:53 -0000
@@ -139,14 +139,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/netwinder/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/netwinder/conf/GENERIC,v
retrieving revision 1.96
diff -u -p -r1.96 GENERIC
--- arch/netwinder/conf/GENERIC 24 Jan 2009 05:06:06 -0000 1.96
+++ arch/netwinder/conf/GENERIC 1 Mar 2009 22:12:57 -0000
@@ -142,7 +142,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/news68k/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/news68k/include/vmparam.h,v
retrieving revision 1.13
diff -u -p -r1.13 vmparam.h
--- arch/news68k/include/vmparam.h 11 Dec 2005 12:18:23 -0000 1.13
+++ arch/news68k/include/vmparam.h 1 Mar 2009 22:13:02 -0000
@@ -139,14 +139,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/next68k/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/next68k/conf/GENERIC,v
retrieving revision 1.116
diff -u -p -r1.116 GENERIC
--- arch/next68k/conf/GENERIC 24 Jan 2009 05:06:06 -0000 1.116
+++ arch/next68k/conf/GENERIC 1 Mar 2009 22:13:07 -0000
@@ -37,7 +37,6 @@ options SYSVSEM # System V semaphores
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V shared memory
options P1003_1B_SEMAPHORE # POSIX semaphore support
-#options SHMMAXPGS=1024 # 1024 pages is the default
options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
Index: arch/next68k/conf/SLAB
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/next68k/conf/SLAB,v
retrieving revision 1.37
diff -u -p -r1.37 SLAB
--- arch/next68k/conf/SLAB 24 Nov 2008 11:41:13 -0000 1.37
+++ arch/next68k/conf/SLAB 1 Mar 2009 22:13:05 -0000
@@ -17,7 +17,6 @@ options SYSVMSG # System V message que
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options P1003_1B_SEMAPHORE # POSIX semaphore support
-#options SHMMAXPGS=1024 # 1024 pages is the default
options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
Index: arch/next68k/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/next68k/include/vmparam.h,v
retrieving revision 1.18
diff -u -p -r1.18 vmparam.h
--- arch/next68k/include/vmparam.h 11 Dec 2005 12:18:25 -0000 1.18
+++ arch/next68k/include/vmparam.h 1 Mar 2009 22:13:14 -0000
@@ -146,14 +146,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/powerpc/include/ibm4xx/vmparam.h
===================================================================
RCS file:
/home/joerg/repo/netbsd/src/sys/arch/powerpc/include/ibm4xx/vmparam.h,v
retrieving revision 1.5
diff -u -p -r1.5 vmparam.h
--- arch/powerpc/include/ibm4xx/vmparam.h 25 Oct 2007 13:03:05 -0000
1.5
+++ arch/powerpc/include/ibm4xx/vmparam.h 1 Mar 2009 22:13:24 -0000
@@ -65,13 +65,6 @@
#endif
/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
-/*
* Size of User Raw I/O map
*/
#define USRIOSIZE 1024
Index: arch/powerpc/include/oea/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/powerpc/include/oea/vmparam.h,v
retrieving revision 1.13
diff -u -p -r1.13 vmparam.h
--- arch/powerpc/include/oea/vmparam.h 28 Apr 2008 20:23:32 -0000 1.13
+++ arch/powerpc/include/oea/vmparam.h 1 Mar 2009 22:13:19 -0000
@@ -75,13 +75,6 @@
#endif
/*
- * Default maximum amount of shared memory pages
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
-/*
* Default number of pages in the user raw I/O map.
*/
#ifndef USRIOSIZE
Index: arch/rs6000/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/rs6000/conf/GENERIC,v
retrieving revision 1.9
diff -u -p -r1.9 GENERIC
--- arch/rs6000/conf/GENERIC 24 Jan 2009 05:06:07 -0000 1.9
+++ arch/rs6000/conf/GENERIC 1 Mar 2009 22:13:27 -0000
@@ -46,7 +46,6 @@ options SYSVSEM # System V-like semaph
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/sbmips/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sbmips/conf/GENERIC,v
retrieving revision 1.73
diff -u -p -r1.73 GENERIC
--- arch/sbmips/conf/GENERIC 24 Jan 2009 05:06:07 -0000 1.73
+++ arch/sbmips/conf/GENERIC 1 Mar 2009 22:13:31 -0000
@@ -21,7 +21,6 @@ options KTRACE # system call tracing s
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
#options NTP # network time protocol
Index: arch/sh3/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sh3/include/vmparam.h,v
retrieving revision 1.18
diff -u -p -r1.18 vmparam.h
--- arch/sh3/include/vmparam.h 28 Apr 2008 20:23:35 -0000 1.18
+++ arch/sh3/include/vmparam.h 1 Mar 2009 22:13:34 -0000
@@ -69,13 +69,6 @@
#define DFLSSIZ (2 * 1024 * 1024)
#endif
-/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
/* Size of user raw I/O map */
#ifndef USRIOSIZE
#define USRIOSIZE (MAXBSIZE / PAGE_SIZE * 8)
Index: arch/shark/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/shark/conf/GENERIC,v
retrieving revision 1.84
diff -u -p -r1.84 GENERIC
--- arch/shark/conf/GENERIC 17 Jan 2009 20:08:07 -0000 1.84
+++ arch/shark/conf/GENERIC 1 Mar 2009 22:13:40 -0000
@@ -130,7 +130,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
# Device options
Index: arch/shark/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/shark/conf/INSTALL,v
retrieving revision 1.40
diff -u -p -r1.40 INSTALL
--- arch/shark/conf/INSTALL 6 Feb 2009 18:50:28 -0000 1.40
+++ arch/shark/conf/INSTALL 1 Mar 2009 22:13:38 -0000
@@ -104,7 +104,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
#options SYSVMSG # System V-like message queues
#options SYSVSEM # System V-like semaphores
#options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/shark/conf/OFWGENCFG
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/shark/conf/OFWGENCFG,v
retrieving revision 1.32
diff -u -p -r1.32 OFWGENCFG
--- arch/shark/conf/OFWGENCFG 12 Nov 2008 12:36:06 -0000 1.32
+++ arch/shark/conf/OFWGENCFG 1 Mar 2009 22:13:37 -0000
@@ -91,7 +91,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options SHMMAXPGS=1024 # 1024 pages is the default
# Device options
Index: arch/sparc/conf/BILL-THE-CAT
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc/conf/BILL-THE-CAT,v
retrieving revision 1.44
diff -u -p -r1.44 BILL-THE-CAT
--- arch/sparc/conf/BILL-THE-CAT 8 Feb 2009 13:05:50 -0000 1.44
+++ arch/sparc/conf/BILL-THE-CAT 1 Mar 2009 22:13:51 -0000
@@ -52,7 +52,6 @@ options KTRACE
#options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
## Loadable kernel module support; still under development.
Index: arch/sparc/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc/conf/INSTALL,v
retrieving revision 1.66
diff -u -p -r1.66 INSTALL
--- arch/sparc/conf/INSTALL 8 Feb 2009 13:05:51 -0000 1.66
+++ arch/sparc/conf/INSTALL 1 Mar 2009 22:13:50 -0000
@@ -79,7 +79,6 @@ config netbsd root on ? type ?
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
## Loadable kernel module support; still under development.
Index: arch/sparc/conf/KRUPS
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc/conf/KRUPS,v
retrieving revision 1.48
diff -u -p -r1.48 KRUPS
--- arch/sparc/conf/KRUPS 8 Feb 2009 13:05:51 -0000 1.48
+++ arch/sparc/conf/KRUPS 1 Mar 2009 22:13:48 -0000
@@ -60,7 +60,6 @@ options SYSVSEM # System V semaphores
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
## Loadable kernel module support; still under development.
Index: arch/sparc/conf/MRCOFFEE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc/conf/MRCOFFEE,v
retrieving revision 1.26
diff -u -p -r1.26 MRCOFFEE
--- arch/sparc/conf/MRCOFFEE 8 Feb 2009 13:05:51 -0000 1.26
+++ arch/sparc/conf/MRCOFFEE 1 Mar 2009 22:13:46 -0000
@@ -65,7 +65,6 @@ options SYSVSEM # System V semaphores
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
## Loadable kernel module support; still under development.
Index: arch/sparc/conf/TADPOLE3GX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc/conf/TADPOLE3GX,v
retrieving revision 1.45
diff -u -p -r1.45 TADPOLE3GX
--- arch/sparc/conf/TADPOLE3GX 22 Feb 2009 04:36:16 -0000 1.45
+++ arch/sparc/conf/TADPOLE3GX 1 Mar 2009 22:13:45 -0000
@@ -64,7 +64,6 @@ options KTRACE
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
## Loadable kernel module support; still under development.
Index: arch/sparc/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc/include/vmparam.h,v
retrieving revision 1.39
diff -u -p -r1.39 vmparam.h
--- arch/sparc/include/vmparam.h 2 Jan 2008 11:48:29 -0000 1.39
+++ arch/sparc/include/vmparam.h 1 Mar 2009 22:03:48 -0000
@@ -98,13 +98,6 @@
#endif
/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/sparc64/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc64/conf/GENERIC,v
retrieving revision 1.109
diff -u -p -r1.109 GENERIC
--- arch/sparc64/conf/GENERIC 24 Jan 2009 05:06:07 -0000 1.109
+++ arch/sparc64/conf/GENERIC 1 Mar 2009 22:13:55 -0000
@@ -60,7 +60,6 @@ options KTRACE
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
Index: arch/sparc64/conf/NONPLUS64
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc64/conf/NONPLUS64,v
retrieving revision 1.27
diff -u -p -r1.27 NONPLUS64
--- arch/sparc64/conf/NONPLUS64 24 Nov 2008 11:41:14 -0000 1.27
+++ arch/sparc64/conf/NONPLUS64 1 Mar 2009 22:13:53 -0000
@@ -45,7 +45,6 @@ options KTRACE
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
## Loadable kernel module support; still under development.
Index: arch/sparc64/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sparc64/include/vmparam.h,v
retrieving revision 1.29
diff -u -p -r1.29 vmparam.h
--- arch/sparc64/include/vmparam.h 27 Jan 2006 18:37:49 -0000 1.29
+++ arch/sparc64/include/vmparam.h 1 Mar 2009 22:14:00 -0000
@@ -149,13 +149,6 @@
#endif
/*
- * Size of shared memory map
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
-/*
* Mach derived constants
*/
Index: arch/sun2/conf/VME
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun2/conf/VME,v
retrieving revision 1.34
diff -u -p -r1.34 VME
--- arch/sun2/conf/VME 24 Nov 2008 11:41:15 -0000 1.34
+++ arch/sun2/conf/VME 1 Mar 2009 22:14:03 -0000
@@ -24,7 +24,6 @@ options SYSVSEM # System V semaphores
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/sun2/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun2/include/vmparam.h,v
retrieving revision 1.12
diff -u -p -r1.12 vmparam.h
--- arch/sun2/include/vmparam.h 28 Apr 2008 20:23:37 -0000 1.12
+++ arch/sun2/include/vmparam.h 1 Mar 2009 22:14:08 -0000
@@ -87,14 +87,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 512 /* 4 MB */
-#endif
-
-/*
* Mach-derived constants:
*/
Index: arch/sun3/conf/DISKLESS
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun3/conf/DISKLESS,v
retrieving revision 1.60
diff -u -p -r1.60 DISKLESS
--- arch/sun3/conf/DISKLESS 17 Jan 2009 07:31:57 -0000 1.60
+++ arch/sun3/conf/DISKLESS 1 Mar 2009 22:14:15 -0000
@@ -23,7 +23,6 @@ maxusers 2
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/sun3/conf/DISKLESS3X
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun3/conf/DISKLESS3X,v
retrieving revision 1.47
diff -u -p -r1.47 DISKLESS3X
--- arch/sun3/conf/DISKLESS3X 17 Jan 2009 07:31:57 -0000 1.47
+++ arch/sun3/conf/DISKLESS3X 1 Mar 2009 22:14:14 -0000
@@ -23,7 +23,6 @@ maxusers 2
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/sun3/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun3/conf/INSTALL,v
retrieving revision 1.44
diff -u -p -r1.44 INSTALL
--- arch/sun3/conf/INSTALL 17 Jan 2009 07:31:57 -0000 1.44
+++ arch/sun3/conf/INSTALL 1 Mar 2009 22:14:12 -0000
@@ -25,7 +25,6 @@ maxusers 2
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/sun3/conf/INSTALL3X
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun3/conf/INSTALL3X,v
retrieving revision 1.43
diff -u -p -r1.43 INSTALL3X
--- arch/sun3/conf/INSTALL3X 17 Jan 2009 07:31:57 -0000 1.43
+++ arch/sun3/conf/INSTALL3X 1 Mar 2009 22:14:11 -0000
@@ -25,7 +25,6 @@ maxusers 2
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
#options INSECURE # disable kernel security level
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: arch/sun3/include/vmparam3.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun3/include/vmparam3.h,v
retrieving revision 1.34
diff -u -p -r1.34 vmparam3.h
--- arch/sun3/include/vmparam3.h 25 Oct 2007 13:03:05 -0000 1.34
+++ arch/sun3/include/vmparam3.h 1 Mar 2009 22:14:29 -0000
@@ -127,12 +127,4 @@
#define USRIOSIZE 128 /* 1 MB */
#endif
-/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 512 /* 4 MB */
-#endif
-
#define PAGER_MAP_DEFAULT_SIZE (4 * 1024 * 1024)
Index: arch/sun3/include/vmparam3x.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sun3/include/vmparam3x.h,v
retrieving revision 1.18
diff -u -p -r1.18 vmparam3x.h
--- arch/sun3/include/vmparam3x.h 11 Dec 2005 12:19:21 -0000 1.18
+++ arch/sun3/include/vmparam3x.h 1 Mar 2009 22:14:22 -0000
@@ -113,11 +113,3 @@
#ifndef USRIOSIZE
#define USRIOSIZE 128 /* 1 MB */
#endif
-
-/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 2048 /* 16 MB */
-#endif
Index: arch/vax/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/vax/include/vmparam.h,v
retrieving revision 1.44
diff -u -p -r1.44 vmparam.h
--- arch/vax/include/vmparam.h 11 Mar 2008 05:34:02 -0000 1.44
+++ arch/vax/include/vmparam.h 1 Mar 2009 22:06:44 -0000
@@ -77,14 +77,6 @@
#define MAXSSIZ (8*1024*1024) /* max stack size */
#endif
-/*
- * Size of shared memory map
- */
-
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024
-#endif
-
#define VM_PHYSSEG_MAX 1
#define VM_PHYSSEG_NOADD
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH /* XXX */
Index: arch/x68k/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/x68k/conf/INSTALL,v
retrieving revision 1.86
diff -u -p -r1.86 INSTALL
--- arch/x68k/conf/INSTALL 6 Feb 2009 18:50:29 -0000 1.86
+++ arch/x68k/conf/INSTALL 1 Mar 2009 22:06:34 -0000
@@ -71,7 +71,6 @@ options RTC_OFFSET=-540 # hardware cloc
#options SYSVMSG # System V message queues
#options SYSVSEM # System V semaphores
#options SYSVSHM # System V shared memory
-#options SHMMAXPGS=1024 # 1024 pages is the default
## Loadable kernel module support
Index: arch/x68k/include/vmparam.h
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/x68k/include/vmparam.h,v
retrieving revision 1.28
diff -u -p -r1.28 vmparam.h
--- arch/x68k/include/vmparam.h 11 Dec 2005 12:19:44 -0000 1.28
+++ arch/x68k/include/vmparam.h 1 Mar 2009 22:06:28 -0000
@@ -131,14 +131,6 @@
#endif
/*
- * PTEs for system V style shared memory.
- * This is basically slop for kmempt which we actually allocate (malloc) from.
- */
-#ifndef SHMMAXPGS
-#define SHMMAXPGS 1024 /* 4mb */
-#endif
-
-/*
* Mach derived constants
*/
Index: conf/param.c
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/conf/param.c,v
retrieving revision 1.59
diff -u -p -r1.59 param.c
--- conf/param.c 12 Nov 2008 14:32:34 -0000 1.59
+++ conf/param.c 1 Mar 2009 22:14:52 -0000
@@ -151,8 +151,10 @@ int mcllowat = MCLLOWAT;
* Values in support of System V compatible shared memory. XXX
*/
#ifdef SYSVSHM
-#ifndef SHMMAX
+#if !defined(SHMMAX) && defined(SHMMAXPGS)
#define SHMMAX SHMMAXPGS /* shminit() performs a `*= PAGE_SIZE'
*/
+#elif !defined(SHMMAX)
+#define SHMMAX 0
#endif
#ifndef SHMMIN
#define SHMMIN 1
@@ -163,14 +165,13 @@ int mcllowat = MCLLOWAT;
#ifndef SHMSEG
#define SHMSEG 128
#endif
-#define SHMALL SHMMAXPGS
struct shminfo shminfo = {
SHMMAX,
SHMMIN,
SHMMNI,
SHMSEG,
- SHMALL
+ 0
};
#endif
Index: kern/sysv_shm.c
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/kern/sysv_shm.c,v
retrieving revision 1.115
diff -u -p -r1.115 sysv_shm.c
--- kern/sysv_shm.c 11 Jan 2009 02:45:53 -0000 1.115
+++ kern/sysv_shm.c 1 Mar 2009 22:26:06 -0000
@@ -973,7 +973,14 @@ shminit(void)
shm_cv = (void *)((uintptr_t)shmsegs +
ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
- shminfo.shmmax *= PAGE_SIZE;
+ if (shminfo.shmmax == 0) {
+ shminfo.shmmax = physmem / 4 * PAGE_SIZE;
+ if (shminfo.shmmax < 1024)
+ shminfo.shmmax = 1024;
+ } else {
+ shminfo.shmmax *= PAGE_SIZE;
+ }
+ shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
for (i = 0; i < shminfo.shmmni; i++) {
cv_init(&shm_cv[i], "shmwait");
Home |
Main Index |
Thread Index |
Old Index