Module Name: src
Committed By: jakllsch
Date: Mon Aug 8 16:27:07 UTC 2011
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
Finish reverting modularization of i386 GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.1042 -r1.1043 src/sys/arch/i386/conf/GENERIC
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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1042 src/sys/arch/i386/conf/GENERIC:1.1043
--- src/sys/arch/i386/conf/GENERIC:1.1042 Sun Aug 7 10:04:41 2011
+++ src/sys/arch/i386/conf/GENERIC Mon Aug 8 16:27:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1042 2011/08/07 10:04:41 tron Exp $
+# $NetBSD: GENERIC,v 1.1043 2011/08/08 16:27:07 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,16 +22,10 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1042 $"
+#ident "GENERIC-$Revision: 1.1043 $"
maxusers 64 # estimated number of users
-# For GENERIC, we build the exec formats as module(7)s by default.
-no options EXEC_AOUT # exec a.out binaries
-no options EXEC_ELF32 # exec ELF binaries
-no options EXEC_SCRIPT # exec #! scripts
-no options COREDUMP
-
# CPU-related options.
options VM86 # virtual 8086 emulation
options USER_LDT # user-settable LDT; used by WINE
@@ -90,9 +84,7 @@
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options P1003_1B_SEMAPHORE # p1003.1b semaphore support
-no options AIO # POSIX asynchronous I/O, built as a module(7)
-no options MQUEUE # POSIX messsage queues, built as a module(7)
+options P1003_1B_SEMAPHORE # p1003.1b semaphore support
options MODULAR # new style module(7) framework
@@ -129,7 +121,7 @@
#options SYSCALL_TIMES # per syscall times
#options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
-# Compatibility options, built as module(7)s by default
+# Compatibility options
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
options COMPAT_09 # NetBSD 0.9
options COMPAT_10 # NetBSD 1.0
@@ -147,11 +139,11 @@
#options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options COMPAT_SVR4 # binary compatibility with SVR4
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
-#options COMPAT_LINUX # binary compatibility with Linux
-#options COMPAT_FREEBSD # binary compatibility with FreeBSD
+options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
+options COMPAT_SVR4 # binary compatibility with SVR4
+options COMPAT_IBCS2 # binary compatibility with SCO and ISC
+options COMPAT_LINUX # binary compatibility with Linux
+options COMPAT_FREEBSD # binary compatibility with FreeBSD
#options COMPAT_NDIS # NDIS network driver
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -164,37 +156,36 @@
file-system FFS # UFS
file-system NFS # Network File System client
-# File systems, built as module(7)s by default
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-#file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PROCFS # /proc
-#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system CODA # Coda File System; also needs vcoda (below)
-#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-#file-system PTYFS # /dev/ptm support
-#file-system TMPFS # Efficient memory file-system
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
+file-system PROCFS # /proc
+file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system PTYFS # /dev/ptm support
+file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
#file-system NILFS # experimental - NTT's NiLFS(2)
#file-system V7FS # 7th Edition(V7) File System
# File system options
-#options QUOTA # legacy UFS quotas
-#options QUOTA2 # new, in-filesystem UFS quotas
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
-#options NFSSERVER # Network File System server
+options NFSSERVER # Network File System server
#options FFS_NO_SNAPSHOT # No FFS snapshot support
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -1597,9 +1588,9 @@
#pseudo-device srt # source-address-based routing
#
-# accept filters, built as module(7)s by default
-#pseudo-device accf_data # "dataready" accept filter
-#pseudo-device accf_http # "httpready" accept filter
+# accept filters
+pseudo-device accf_data # "dataready" accept filter
+pseudo-device accf_http # "httpready" accept filter
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
@@ -1615,10 +1606,10 @@
#pseudo-device gpiosim 1 # GPIO simulator
# a pseudo device needed for Coda # also needs CODA (above)
-#pseudo-device vcoda 4 # coda minicache <-> venus comm.
+pseudo-device vcoda 4 # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
-#pseudo-device nsmb # experimental - SMB requester
+pseudo-device nsmb # experimental - SMB requester
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
