From 2287052465eeb0474ca7ec364c08f7e1bca3ad33 Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 22 Aug 2002 14:36:48 +0000 Subject: [PATCH] PIPE_SOCKETPAIR, MALLOC_NOINLINE and VNODE_OP_NOINLINE are all appropriate for the 'minimal memory' configurations. --- sys/arch/i386/conf/GENERIC_PS2TINY | 8 ++++++-- sys/arch/i386/conf/GENERIC_TINY | 3 ++- sys/arch/news68k/conf/GENERIC_TINY | 6 ++++-- sys/arch/sun2/conf/DISKLESS | 7 ++++--- sys/arch/sun2/conf/FOURMEG | 7 ++++--- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY index 881b37bcb529..b0d6538c3cc3 100644 --- a/sys/arch/i386/conf/GENERIC_PS2TINY +++ b/sys/arch/i386/conf/GENERIC_PS2TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_PS2TINY,v 1.16 2002/08/06 12:09:42 grant Exp $ +# $NetBSD: GENERIC_PS2TINY,v 1.17 2002/08/22 14:36:49 abs Exp $ # # GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains # IBM PS/2 related stuff and has been generally trimmed down somewhat, @@ -68,7 +68,8 @@ options SYSVSHM # System V-like memory sharing options LKM # loadable kernel modules #options USERCONF # userconf(4) support -#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options MALLOC_NOINLINE # Not inlining MALLOC saves memory # Diagnostic/debugging support options #options DIAGNOSTIC # expensive kernel consistency checks @@ -107,6 +108,9 @@ options SOFTDEP # FFS soft updates support. #options NFSSERVER # Network File System server #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. + +options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem + # Networking options #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY index e1a6abca7fbf..375e868f2060 100644 --- a/sys/arch/i386/conf/GENERIC_TINY +++ b/sys/arch/i386/conf/GENERIC_TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.44 2002/08/06 12:09:43 grant Exp $ +# $NetBSD: GENERIC_TINY,v 1.45 2002/08/22 14:36:49 abs Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -61,6 +61,7 @@ options NMBCLUSTERS=256 #options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options MALLOC_NOINLINE # Not inlining MALLOC saves memory # Diagnostic/debugging support options #options DIAGNOSTIC # expensive kernel consistency checks diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY index 67ef1d5c0a13..4939dd7e4e88 100644 --- a/sys/arch/news68k/conf/GENERIC_TINY +++ b/sys/arch/news68k/conf/GENERIC_TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.15 2002/06/17 05:14:18 lukem Exp $ +# $NetBSD: GENERIC_TINY,v 1.16 2002/08/22 14:36:49 abs Exp $ # news68k GENERIC config file for low memory machines; # @@ -6,7 +6,7 @@ include "arch/news68k/conf/std.news68k" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC_TINY-$Revision: 1.15 $" +#ident "GENERIC_TINY-$Revision: 1.16 $" maxusers 4 @@ -26,6 +26,7 @@ options LKM # loadable kernel modules #options UCONSOLE # users can redirect console (unsafe) #options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options MALLOC_NOINLINE # Not inlining MALLOC saves memory # Debugging options #options DIAGNOSTIC # extra kernel sanity checking @@ -72,6 +73,7 @@ options NFSSERVER # nfs server support #options QUOTA # ffs quotas #options FFS_EI # ffs endian independant support options SOFTDEP # ffs soft updates support +options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem # Networking options options INET # Internet protocols diff --git a/sys/arch/sun2/conf/DISKLESS b/sys/arch/sun2/conf/DISKLESS index de8a63f3f5fa..3101a41db699 100644 --- a/sys/arch/sun2/conf/DISKLESS +++ b/sys/arch/sun2/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.12 2002/06/17 05:14:26 lukem Exp $ +# $NetBSD: DISKLESS,v 1.13 2002/08/22 14:36:48 abs Exp $ # DISKLESS Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, ec0 @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "DISKLESS-$Revision: 1.12 $" +#ident "DISKLESS-$Revision: 1.13 $" # Machines to be supported by this kernel #options FPU_EMULATE @@ -26,6 +26,7 @@ options SYSVSHM # System V shared memory #options UCONSOLE # Allow non-root TIOCCONS #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +#options MALLOC_NOINLINE # Not inlining MALLOC saves memory # Which kernel debugger? Uncomment either this: options DDB @@ -67,7 +68,7 @@ file-system MFS # memory-based filesystem #options FFS_EI # FFS Endian Independant support #options SOFTDEP # FFS soft updates support. #options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space -options VNODE_OP_NOINLINE # Save space by not inlining vnode op calls +options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem # Networking options options INET # IP prototol stack support diff --git a/sys/arch/sun2/conf/FOURMEG b/sys/arch/sun2/conf/FOURMEG index eb1d65126508..b473f9cbb45b 100644 --- a/sys/arch/sun2/conf/FOURMEG +++ b/sys/arch/sun2/conf/FOURMEG @@ -1,4 +1,4 @@ -# $NetBSD: FOURMEG,v 1.13 2002/06/17 05:14:26 lukem Exp $ +# $NetBSD: FOURMEG,v 1.14 2002/08/22 14:36:48 abs Exp $ # FOURMEG Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, sd*, ... @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "FOURMEG-$Revision: 1.13 $" +#ident "FOURMEG-$Revision: 1.14 $" # Machines to be supported by this kernel #options FPU_EMULATE @@ -26,6 +26,7 @@ options KTRACE # system call tracing #options UCONSOLE # Allow non-root TIOCCONS #options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options MALLOC_NOINLINE # Not inlining MALLOC saves memory # Which kernel debugger? Uncomment either this: #options DDB @@ -67,7 +68,7 @@ file-system CD9660 # ISO 9660 + Rock Ridge file system #options FFS_EI # FFS Endian Independant support #options SOFTDEP # FFS soft updates support. #options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space -options VNODE_OP_NOINLINE # Save space by not inlining vnode op calls +options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem # Networking options options INET # IP prototol stack support