Source-Changes-D archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: CVS commit: src/sys/arch/amd64/conf
On Aug,Monday 8 2011, at 6:13 PM, Jonathan A. Kollasch wrote:
> Module Name: src
> Committed By: jakllsch
> Date: Mon Aug 8 16:13:42 UTC 2011
>
> Modified Files:
> src/sys/arch/amd64/conf: GENERIC INSTALL
>
> Log Message:
> Finish reverting premature modularization of amd64 kernels.
I object against this change please revert it.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.328 -r1.329 src/sys/arch/amd64/conf/GENERIC
> cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/conf/INSTALL
>
> 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/amd64/conf/GENERIC
> diff -u src/sys/arch/amd64/conf/GENERIC:1.328
> src/sys/arch/amd64/conf/GENERIC:1.329
> --- src/sys/arch/amd64/conf/GENERIC:1.328 Sat Jul 30 18:41:34 2011
> +++ src/sys/arch/amd64/conf/GENERIC Mon Aug 8 16:13:42 2011
> @@ -1,4 +1,4 @@
> -# $NetBSD: GENERIC,v 1.328 2011/07/30 18:41:34 jmcneill Exp $
> +# $NetBSD: GENERIC,v 1.329 2011/08/08 16:13:42 jakllsch Exp $
> #
> # GENERIC machine description file
> #
> @@ -22,15 +22,10 @@
>
> options INCLUDE_CONFIG_FILE # embed config file in kernel binary
>
> -#ident "GENERIC-$Revision: 1.328 $"
> +#ident "GENERIC-$Revision: 1.329 $"
>
> maxusers 64 # estimated number of users
>
> -# Common binary formats are statically compiled in by default.
> -options EXEC_ELF32 # exec ELF 32-bits binaries
> -#no options EXEC_ELF64 # exec ELF 64-bits binaries
> -#no options EXEC_SCRIPT # exec #! scripts
> -
> # delay between "rebooting ..." message and hardware reset, in milliseconds
> #options CPURESET_DELAY=2000
>
> @@ -70,8 +65,6 @@
> 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 MODULAR # new style module(7) framework
> options USERCONF # userconf(4) support
> @@ -124,8 +117,9 @@
>
> options COMPAT_OSSAUDIO
> options COMPAT_NETBSD32
> -#options COMPAT_LINUX
> -#options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
> +options COMPAT_LINUX
> +options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
> +options EXEC_ELF32
> options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
>
> # Wedge support
> @@ -139,23 +133,22 @@
> file-system MFS # memory file system
> file-system NFS # Network File System client
> file-system TMPFS # Efficient memory file-system
> -# 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 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 SMBFS # experimental - CIFS; also needs nsmb (below)
> -#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 PTYFS # /dev/ptm support
> +file-system EXT2FS # second extended file system (linux)
> +file-system LFS # log-structured 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 SMBFS # experimental - CIFS; also needs nsmb (below)
> +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 PTYFS # /dev/ptm support
> #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)
> @@ -1157,9 +1150,9 @@
> pseudo-device agr # IEEE 802.3ad link aggregation
>
> #
> -# 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
> @@ -1176,7 +1169,7 @@
> pseudo-device btuart # Bluetooth HCI UART (H4)
>
> # 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
>
> Index: src/sys/arch/amd64/conf/INSTALL
> diff -u src/sys/arch/amd64/conf/INSTALL:1.86
> src/sys/arch/amd64/conf/INSTALL:1.87
> --- src/sys/arch/amd64/conf/INSTALL:1.86 Sat May 28 16:58:51 2011
> +++ src/sys/arch/amd64/conf/INSTALL Mon Aug 8 16:13:42 2011
> @@ -1,4 +1,4 @@
> -# $NetBSD: INSTALL,v 1.86 2011/05/28 16:58:51 ryo Exp $
> +# $NetBSD: INSTALL,v 1.87 2011/08/08 16:13:42 jakllsch Exp $
> #
> # INSTALL - Installation kernel.
> #
> @@ -7,16 +7,7 @@
>
> include "arch/amd64/conf/GENERIC"
>
> -#ident "INSTALL-$Revision: 1.86 $"
> -
> -# INSTALL kernels do not have access to module(7)s. Compile some
> -# file-systems statically.
> -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
> +#ident "INSTALL-$Revision: 1.87 $"
>
> no options MEMORY_DISK_DYNAMIC
> options MEMORY_DISK_IS_ROOT # force root on memory disk
>
Regards
Adam.
Home |
Main Index |
Thread Index |
Old Index