diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/options | 25 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 7 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 7 | ||||
| -rw-r--r-- | sys/kern/vfs_extattr.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 4 |
5 files changed, 31 insertions, 16 deletions
diff --git a/sys/conf/options b/sys/conf/options index fd4e04f2352d..47fede96f9ea 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.10 1996/03/29 13:51:30 bde Exp $ +# $Id: options,v 1.11 1996/05/05 02:26:57 pst Exp $ # Option name filename @@ -6,13 +6,22 @@ BOUNCE_BUFFERS opt_bounce.h DDB DDB_UNATTENDED opt_ddb.h KTRACE -FDESC opt_staticfs.h -KERNFS opt_staticfs.h -NULLFS opt_staticfs.h -PORTAL opt_staticfs.h -PROCFS opt_staticfs.h -UMAPFS opt_staticfs.h -UNION opt_staticfs.h + +# Options for static file systems. These should only be used at config +# time, since the corresponding lkms cannot work if there are any static +# dependencies. Unusability is enforced by hiding the defines for the +# options in a never-included header. +FDESC opt_dontuse.h +KERNFS opt_dontuse.h +NULLFS opt_dontuse.h +PORTAL opt_dontuse.h +PROCFS opt_dontuse.h +UMAPFS opt_dontuse.h + +# The union static file system has bogus static dependencies, so it isn't +# hidden yet. +UNION + QUOTA SYSVSHM opt_sysvipc.h SYSVSEM opt_sysvipc.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index a5b011b91141..51f72dcddafe 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,9 +1,12 @@ -# $Id: options.i386,v 1.11 1996/04/26 06:44:46 sos Exp $ +# $Id: options.i386,v 1.12 1996/05/01 03:30:04 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h -IBCS2 opt_ibcs2.h + +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h + SHOW_BUSYBUFS opt_machdep.h PANIC_REBOOT_WAIT_TIME opt_machdep.h LARGEMEM opt_machdep.h diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index a5b011b91141..51f72dcddafe 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,9 +1,12 @@ -# $Id: options.i386,v 1.11 1996/04/26 06:44:46 sos Exp $ +# $Id: options.i386,v 1.12 1996/05/01 03:30:04 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h -IBCS2 opt_ibcs2.h + +IBCS2 opt_dontuse.h +COMPAT_LINUX opt_dontuse.h + SHOW_BUSYBUFS opt_machdep.h PANIC_REBOOT_WAIT_TIME opt_machdep.h LARGEMEM opt_machdep.h diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 945b30094c7a..ec728b3d57f3 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.45 1996/01/05 17:46:14 wollman Exp $ + * $Id: vfs_syscalls.c,v 1.46 1996/01/16 13:07:14 davidg Exp $ */ /* @@ -46,7 +46,7 @@ * but I don't have time to study the code deeply enough to understand * what's going on and determine an appropriate fix. -GAW */ -#include "opt_staticfs.h" +#include "opt_union.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 945b30094c7a..ec728b3d57f3 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.45 1996/01/05 17:46:14 wollman Exp $ + * $Id: vfs_syscalls.c,v 1.46 1996/01/16 13:07:14 davidg Exp $ */ /* @@ -46,7 +46,7 @@ * but I don't have time to study the code deeply enough to understand * what's going on and determine an appropriate fix. -GAW */ -#include "opt_staticfs.h" +#include "opt_union.h" #include <sys/param.h> #include <sys/systm.h> |