head	1.17;
access;
symbols
	netbsd-11-0-RC4:1.17
	netbsd-11-0-RC3:1.17
	netbsd-11-0-RC2:1.17
	netbsd-11-0-RC1:1.17
	perseant-exfatfs-base-20250801:1.17
	netbsd-11:1.17.0.58
	netbsd-11-base:1.17
	netbsd-10-1-RELEASE:1.17
	perseant-exfatfs-base-20240630:1.17
	perseant-exfatfs:1.17.0.56
	perseant-exfatfs-base:1.17
	netbsd-8-3-RELEASE:1.17
	netbsd-9-4-RELEASE:1.17
	netbsd-10-0-RELEASE:1.17
	netbsd-10-0-RC6:1.17
	netbsd-10-0-RC5:1.17
	netbsd-10-0-RC4:1.17
	netbsd-10-0-RC3:1.17
	netbsd-10-0-RC2:1.17
	thorpej-ifq:1.17.0.54
	thorpej-ifq-base:1.17
	thorpej-altq-separation:1.17.0.52
	thorpej-altq-separation-base:1.17
	netbsd-10-0-RC1:1.17
	netbsd-10:1.17.0.50
	netbsd-10-base:1.17
	bouyer-sunxi-drm:1.17.0.48
	bouyer-sunxi-drm-base:1.17
	netbsd-9-3-RELEASE:1.17
	thorpej-i2c-spi-conf2:1.17.0.46
	thorpej-i2c-spi-conf2-base:1.17
	thorpej-futex2:1.17.0.44
	thorpej-futex2-base:1.17
	thorpej-cfargs2:1.17.0.42
	thorpej-cfargs2-base:1.17
	cjep_sun2x-base1:1.17
	cjep_sun2x:1.17.0.40
	cjep_sun2x-base:1.17
	cjep_staticlib_x-base1:1.17
	netbsd-9-2-RELEASE:1.17
	cjep_staticlib_x:1.17.0.38
	cjep_staticlib_x-base:1.17
	thorpej-i2c-spi-conf:1.17.0.36
	thorpej-i2c-spi-conf-base:1.17
	thorpej-cfargs:1.17.0.34
	thorpej-cfargs-base:1.17
	thorpej-futex:1.17.0.32
	thorpej-futex-base:1.17
	netbsd-9-1-RELEASE:1.17
	bouyer-xenpvh-base2:1.17
	phil-wifi-20200421:1.17
	bouyer-xenpvh-base1:1.17
	phil-wifi-20200411:1.17
	bouyer-xenpvh:1.17.0.30
	bouyer-xenpvh-base:1.17
	is-mlppp:1.17.0.28
	is-mlppp-base:1.17
	phil-wifi-20200406:1.17
	netbsd-8-2-RELEASE:1.17
	ad-namecache-base3:1.17
	netbsd-9-0-RELEASE:1.17
	netbsd-9-0-RC2:1.17
	ad-namecache-base2:1.17
	ad-namecache-base1:1.17
	ad-namecache:1.17.0.26
	ad-namecache-base:1.17
	netbsd-9-0-RC1:1.17
	phil-wifi-20191119:1.17
	netbsd-9:1.17.0.24
	netbsd-9-base:1.17
	phil-wifi-20190609:1.17
	netbsd-8-1-RELEASE:1.17
	netbsd-8-1-RC1:1.17
	isaki-audio2:1.17.0.22
	isaki-audio2-base:1.17
	pgoyette-compat-merge-20190127:1.17
	pgoyette-compat-20190127:1.17
	pgoyette-compat-20190118:1.17
	pgoyette-compat-1226:1.17
	pgoyette-compat-1126:1.17
	pgoyette-compat-1020:1.17
	pgoyette-compat-0930:1.17
	pgoyette-compat-0906:1.17
	netbsd-7-2-RELEASE:1.16.28.1
	pgoyette-compat-0728:1.17
	netbsd-8-0-RELEASE:1.17
	phil-wifi:1.17.0.20
	phil-wifi-base:1.17
	pgoyette-compat-0625:1.17
	netbsd-8-0-RC2:1.17
	pgoyette-compat-0521:1.17
	pgoyette-compat-0502:1.17
	pgoyette-compat-0422:1.17
	netbsd-8-0-RC1:1.17
	pgoyette-compat-0415:1.17
	pgoyette-compat-0407:1.17
	pgoyette-compat-0330:1.17
	pgoyette-compat-0322:1.17
	pgoyette-compat-0315:1.17
	netbsd-7-1-2-RELEASE:1.16.28.1
	pgoyette-compat:1.17.0.18
	pgoyette-compat-base:1.17
	netbsd-7-1-1-RELEASE:1.16.28.1
	tls-maxphys-base-20171202:1.17
	matt-nb8-mediatek:1.17.0.16
	matt-nb8-mediatek-base:1.17
	nick-nhusb-base-20170825:1.17
	perseant-stdc-iso10646:1.17.0.14
	perseant-stdc-iso10646-base:1.17
	netbsd-8:1.17.0.12
	netbsd-8-base:1.17
	prg-localcount2-base3:1.17
	prg-localcount2-base2:1.17
	prg-localcount2-base1:1.17
	prg-localcount2:1.17.0.10
	prg-localcount2-base:1.17
	pgoyette-localcount-20170426:1.17
	bouyer-socketcan-base1:1.17
	jdolecek-ncq:1.17.0.8
	jdolecek-ncq-base:1.17
	pgoyette-localcount-20170320:1.17
	netbsd-7-1:1.16.28.1.0.6
	netbsd-7-1-RELEASE:1.16.28.1
	netbsd-7-1-RC2:1.16.28.1
	nick-nhusb-base-20170204:1.17
	netbsd-7-nhusb-base-20170116:1.16.28.1
	bouyer-socketcan:1.17.0.6
	bouyer-socketcan-base:1.17
	pgoyette-localcount-20170107:1.17
	netbsd-7-1-RC1:1.16.28.1
	nick-nhusb-base-20161204:1.17
	pgoyette-localcount-20161104:1.17
	netbsd-7-0-2-RELEASE:1.16.28.1
	nick-nhusb-base-20161004:1.17
	localcount-20160914:1.17
	netbsd-7-nhusb:1.16.28.1.0.4
	netbsd-7-nhusb-base:1.16.28.1
	pgoyette-localcount-20160806:1.17
	pgoyette-localcount-20160726:1.17
	pgoyette-localcount:1.17.0.4
	pgoyette-localcount-base:1.17
	nick-nhusb-base-20160907:1.17
	nick-nhusb-base-20160529:1.17
	netbsd-7-0-1-RELEASE:1.16.28.1
	nick-nhusb-base-20160422:1.17
	nick-nhusb-base-20160319:1.17
	nick-nhusb-base-20151226:1.17
	netbsd-7-0:1.16.28.1.0.2
	netbsd-7-0-RELEASE:1.16.28.1
	nick-nhusb-base-20150921:1.17
	netbsd-7-0-RC3:1.16.28.1
	netbsd-7-0-RC2:1.16.28.1
	netbsd-7-0-RC1:1.16.28.1
	nick-nhusb-base-20150606:1.17
	nick-nhusb-base-20150406:1.17
	nick-nhusb:1.17.0.2
	nick-nhusb-base:1.17
	netbsd-6-0-6-RELEASE:1.16
	netbsd-6-1-5-RELEASE:1.16
	netbsd-7:1.16.0.28
	netbsd-7-base:1.16
	yamt-pagecache-base9:1.16
	yamt-pagecache-tag8:1.16
	netbsd-6-1-4-RELEASE:1.16
	netbsd-6-0-5-RELEASE:1.16
	tls-earlyentropy:1.16.0.26
	tls-earlyentropy-base:1.16
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.16
	riastradh-drm2-base3:1.16
	netbsd-6-1-3-RELEASE:1.16
	netbsd-6-0-4-RELEASE:1.16
	netbsd-6-1-2-RELEASE:1.16
	netbsd-6-0-3-RELEASE:1.16
	rmind-smpnet-nbase:1.16
	netbsd-6-1-1-RELEASE:1.16
	riastradh-drm2-base2:1.16
	riastradh-drm2-base1:1.16
	riastradh-drm2:1.16.0.24
	riastradh-drm2-base:1.16
	rmind-smpnet:1.16.0.16
	rmind-smpnet-base:1.16
	netbsd-6-1:1.16.0.22
	netbsd-6-0-2-RELEASE:1.16
	netbsd-6-1-RELEASE:1.16
	khorben-n900:1.16.0.20
	netbsd-6-1-RC4:1.16
	netbsd-6-1-RC3:1.16
	agc-symver:1.16.0.18
	agc-symver-base:1.16
	netbsd-6-1-RC2:1.16
	netbsd-6-1-RC1:1.16
	yamt-pagecache-base8:1.16
	netbsd-6-0-1-RELEASE:1.16
	yamt-pagecache-base7:1.16
	matt-nb6-plus-nbase:1.16
	yamt-pagecache-base6:1.16
	netbsd-6-0:1.16.0.14
	netbsd-6-0-RELEASE:1.16
	netbsd-6-0-RC2:1.16
	tls-maxphys:1.16.0.12
	tls-maxphys-base:1.16
	matt-nb6-plus:1.16.0.10
	matt-nb6-plus-base:1.16
	netbsd-6-0-RC1:1.16
	jmcneill-usbmp-base10:1.16
	yamt-pagecache-base5:1.16
	jmcneill-usbmp-base9:1.16
	yamt-pagecache-base4:1.16
	jmcneill-usbmp-base8:1.16
	jmcneill-usbmp-base7:1.16
	jmcneill-usbmp-base6:1.16
	jmcneill-usbmp-base5:1.16
	jmcneill-usbmp-base4:1.16
	jmcneill-usbmp-base3:1.16
	jmcneill-usbmp-pre-base2:1.16
	jmcneill-usbmp-base2:1.16
	netbsd-6:1.16.0.8
	netbsd-6-base:1.16
	jmcneill-usbmp:1.16.0.6
	jmcneill-usbmp-base:1.16
	jmcneill-audiomp3:1.16.0.4
	jmcneill-audiomp3-base:1.16
	yamt-pagecache-base3:1.16
	yamt-pagecache-base2:1.16
	yamt-pagecache:1.16.0.2
	yamt-pagecache-base:1.16
	rmind-uvmplock-nbase:1.15
	cherry-xenmp:1.15.0.2
	cherry-xenmp-base:1.15
	jym-xensuspend-nbase:1.16
	uebayasi-xip-base7:1.14
	bouyer-quota2-nbase:1.14
	bouyer-quota2:1.13.0.4
	bouyer-quota2-base:1.14
	jruoho-x86intr:1.13.0.2
	jruoho-x86intr-base:1.13
	matt-mips64-premerge-20101231:1.13
	uebayasi-xip-base6:1.12
	uebayasi-xip-base5:1.12
	uebayasi-xip-base4:1.12
	uebayasi-xip-base3:1.12
	yamt-nfs-mp-base11:1.12
	uebayasi-xip-base2:1.11
	yamt-nfs-mp-base10:1.11
	uebayasi-xip-base1:1.11
	rmind-uvmplock:1.10.0.4
	rmind-uvmplock-base:1.15
	yamt-nfs-mp-base9:1.10
	uebayasi-xip:1.10.0.2
	uebayasi-xip-base:1.10
	matt-premerge-20091211:1.9
	yamt-nfs-mp-base8:1.8
	yamt-nfs-mp-base7:1.8
	jymxensuspend-base:1.8
	yamt-nfs-mp-base6:1.7
	yamt-nfs-mp-base5:1.7
	yamt-nfs-mp-base4:1.7
	yamt-nfs-mp:1.7.0.2
	yamt-nfs-mp-base3:1.7
	nick-hppapmap-base4:1.7
	nick-hppapmap-base3:1.7
	nick-hppapmap-base2:1.3
	jym-xensuspend:1.3.0.2
	jym-xensuspend-base:1.16
	nick-hppapmap-base:1.7
	nick-hppapmap:1.2.0.4
	mjf-devfs2-base:1.2
	mjf-devfs2:1.2.0.2;
locks; strict;
comment	@# @;


1.17
date	2014.08.24.07.59.22;	author jnemeth;	state Exp;
branches;
next	1.16;
commitid	SkWajjUme0wZtANx;

1.16
date	2011.08.09.14.18.17;	author jakllsch;	state Exp;
branches
	1.16.12.1
	1.16.28.1;
next	1.15;

1.15
date	2011.03.06.17.08.26;	author bouyer;	state Exp;
branches;
next	1.14;

1.14
date	2011.02.13.04.42.54;	author jym;	state Exp;
branches;
next	1.13;

1.13
date	2010.12.15.08.09.02;	author haad;	state Exp;
branches
	1.13.2.1
	1.13.4.1;
next	1.12;

1.12
date	2010.08.22.18.56.21;	author rmind;	state Exp;
branches;
next	1.11;

1.11
date	2010.04.09.14.02.05;	author ahoka;	state Exp;
branches;
next	1.10;

1.10
date	2010.01.01.22.12.19;	author dholland;	state Exp;
branches
	1.10.2.1
	1.10.4.1;
next	1.9;

1.9
date	2009.12.05.20.11.15;	author pooka;	state Exp;
branches;
next	1.8;

1.8
date	2009.07.19.02.50.44;	author rmind;	state Exp;
branches;
next	1.7;

1.7
date	2009.03.29.17.06.01;	author mrg;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2009.03.24.11.53.22;	author pooka;	state Exp;
branches;
next	1.5;

1.5
date	2009.03.24.11.52.21;	author pooka;	state Exp;
branches;
next	1.4;

1.4
date	2009.03.18.20.57.45;	author dyoung;	state Exp;
branches;
next	1.3;

1.3
date	2009.02.07.09.58.10;	author mrg;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2008.12.23.16.34.44;	author christos;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2008.12.23.16.29.53;	author christos;	state Exp;
branches;
next	;

1.16.12.1
date	2017.12.03.11.36.17;	author jdolecek;	state Exp;
branches;
next	;
commitid	XcIYRZTAh1LmerhA;

1.16.28.1
date	2015.05.15.03.44.18;	author snj;	state Exp;
branches;
next	;
commitid	ro7V5s9WBO35Culy;

1.13.2.1
date	2011.06.06.09.05.47;	author jruoho;	state Exp;
branches;
next	;

1.13.4.1
date	2011.02.08.19.29.35;	author bouyer;	state Exp;
branches;
next	1.13.4.2;

1.13.4.2
date	2011.02.17.11.59.44;	author bouyer;	state Exp;
branches;
next	;

1.10.2.1
date	2010.04.30.14.39.28;	author uebayasi;	state Exp;
branches;
next	1.10.2.2;

1.10.2.2
date	2010.10.22.07.21.19;	author uebayasi;	state Exp;
branches;
next	;

1.10.4.1
date	2010.05.30.05.16.53;	author rmind;	state Exp;
branches;
next	1.10.4.2;

1.10.4.2
date	2011.03.05.20.50.38;	author rmind;	state Exp;
branches;
next	1.10.4.3;

1.10.4.3
date	2011.04.21.01.41.05;	author rmind;	state Exp;
branches;
next	;

1.7.2.1
date	2009.03.29.17.06.01;	author yamt;	state dead;
branches;
next	1.7.2.2;

1.7.2.2
date	2009.05.04.08.11.15;	author yamt;	state Exp;
branches;
next	1.7.2.3;

1.7.2.3
date	2009.08.19.18.46.18;	author yamt;	state Exp;
branches;
next	1.7.2.4;

1.7.2.4
date	2010.03.11.15.02.27;	author yamt;	state Exp;
branches;
next	1.7.2.5;

1.7.2.5
date	2010.08.11.22.52.10;	author yamt;	state Exp;
branches;
next	1.7.2.6;

1.7.2.6
date	2010.10.09.03.31.46;	author yamt;	state Exp;
branches;
next	;

1.3.2.1
date	2009.05.13.17.17.49;	author jym;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2009.07.23.23.31.36;	author jym;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2010.10.24.22.47.59;	author jym;	state Exp;
branches;
next	1.3.2.4;

1.3.2.4
date	2011.01.10.00.37.29;	author jym;	state Exp;
branches;
next	1.3.2.5;

1.3.2.5
date	2011.03.28.23.04.39;	author jym;	state Exp;
branches;
next	1.3.2.6;

1.3.2.6
date	2011.03.29.20.42.58;	author jym;	state Exp;
branches;
next	1.3.2.7;

1.3.2.7
date	2011.08.27.15.37.24;	author jym;	state Exp;
branches;
next	;

1.2.2.1
date	2008.12.23.16.34.44;	author mjf;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2009.01.17.13.28.03;	author mjf;	state Exp;
branches;
next	;

1.2.4.1
date	2008.12.23.16.34.44;	author skrll;	state dead;
branches;
next	1.2.4.2;

1.2.4.2
date	2009.01.19.13.16.15;	author skrll;	state Exp;
branches;
next	1.2.4.3;

1.2.4.3
date	2009.03.03.18.28.59;	author skrll;	state Exp;
branches;
next	1.2.4.4;

1.2.4.4
date	2009.04.28.07.34.07;	author skrll;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add
it to all kernel configs that contain "options MODULAR".  This
option turns on module autoloading by default (which is the current
default).  This allows people who don't want module autoloading on
by default to disable it by simply removing/commentting this line.
@
text
@# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $
#
# Non MODULAR
#
include "arch/i386/conf/GENERIC"

no options	MODULAR
no options	MODULAR_DEFAULT_AUTOLOAD
@


1.16
log
@While the GENERIC/MONOLITHIC/MODULAR issue remains to be sorted out,
MONOLITHIC is still a part of the release build and needs to remain
config(1)urable.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.15 2011/03/06 17:08:26 bouyer Exp $
d8 1
@


1.16.12.1
log
@update from HEAD
@
text
@d1 1
a1 1
# $NetBSD$
a7 1
no options	MODULAR_DEFAULT_AUTOLOAD
@


1.16.28.1
log
@Pull up following revision(s) (requested by jnemeth in ticket #762):
	share/man/man4/options.4: revision 1.442
	sys/arch/amd64/conf/ALL: revision 1.18
	sys/arch/amd64/conf/GENERIC: revision 1.396
	sys/arch/dreamcast/conf/GENERIC: revision 1.119
	sys/arch/epoc32/conf/GENERIC: revision 1.6
	sys/arch/evbarm/conf/BCM5301X: revision 1.24
	sys/arch/evbarm/conf/BCM56340: revision 1.9
	sys/arch/evbarm/conf/IMX23_OLINUXINO: revision 1.9
	sys/arch/evbarm/conf/std.beagle: revision 1.13
	sys/arch/evbarm/conf/std.kobo: revision 1.2
	sys/arch/evbarm/conf/std.netwalker: revision 1.10
	sys/arch/evbppc/conf/P2020DS: revision 1.25
	sys/arch/evbppc/conf/RB800: revision 1.30
	sys/arch/evbppc/conf/TWRP1025: revision 1.18
	sys/arch/hp300/conf/GENERIC: revision 1.187
	sys/arch/hpcsh/conf/GENERIC: revision 1.104
	sys/arch/i386/conf/GENERIC: revision 1.1111
	sys/arch/i386/conf/MONOLITHIC: revision 1.17
	sys/arch/landisk/conf/GENERIC: revision 1.43
	sys/arch/luna68k/conf/GENERIC: revision 1.117
	sys/arch/macppc/conf/GENERIC: revision 1.316
	sys/arch/macppc/conf/GENERIC_601: revision 1.5
	sys/arch/mmeye/conf/MMEYE_WLF: revision 1.16
	sys/arch/news68k/conf/GENERIC: revision 1.123
	sys/arch/sandpoint/conf/GENERIC: revision 1.85
	sys/arch/shark/conf/GENERIC: revision 1.119
	sys/arch/sparc/conf/GENERIC: revision 1.246
	sys/arch/sparc64/conf/GENERIC: revision 1.174
	sys/arch/sun3/conf/GENERIC3X: revision 1.125
	sys/arch/sun3/conf/GENERIC: revision 1.169
	sys/arch/x68k/conf/GENERIC: revision 1.177
	sys/arch/zaurus/conf/GENERIC: revision 1.62
	sys/conf/files: revision 1.1099
	sys/kern/kern_module.c: revisions 1.98, 1.99
Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add
it to all kernel configs that contain "options MODULAR".  This
option turns on module autoloading by default (which is the current
default).  This allows people who don't want module autoloading on
by default to disable it by simply removing/commentting this line.
--
fix typo. (s/MODULE_DEFAULT_AUTOLOAD/MODULAR_DEFAULT_AUTOLOAD/)
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $
a7 1
no options	MODULAR_DEFAULT_AUTOLOAD
@


1.15
log
@merge the bouyer-quota2 branch. This adds a new on-disk format
to store disk quota usage and limits, integrated with ffs
metadata. Usage is checked by fsck_ffs (no more quotacheck)
and is covered by the WAPBL journal. Enabled with kernel
option QUOTA2 (added where QUOTA was enabled in kernel config files),
turned on with tunefs(8) on a per-filesystem
basis. mount_mfs(8) can also turn quotas on.

See http://mail-index.netbsd.org/tech-kern/2011/02/19/msg010025.html
for details.
@
text
@d1 1
a1 1
# $NetBSD$
d3 1
a3 1
# Non MODULAR, used mostly as a reference as to what we modularized.
a7 61

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts
options 	COREDUMP

options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
options 	AIO		# POSIX asynchronous I/O, built as a module
options 	MQUEUE		# POSIX messsage queues, built as a module

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

#file-system 	FFS		# UFS
#file-system 	NFS		# Network File System client
# File systems
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 	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	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)

options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas

options 	NFSSERVER

options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP

# NPF
#pseudo-device	npf

pseudo-device	accf_data	# "dataready" accept filter
pseudo-device	accf_http	# "httpready" accept filter

pseudo-device	vcoda		4	# coda minicache <-> venus comm.

pseudo-device	nsmb		# experimental - SMB requester

pseudo-device	putter		# for puffs and pud

pseudo-device	pad		# pseudo audio device driver

pseudo-device 	dm		# device-mapper device driver
@


1.14
log
@Comment out FFS and NFS, they are part of GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.13 2010/12/15 08:09:02 haad Exp $
d46 2
a47 1
options 	QUOTA		# UFS quotas
@


1.13
log
@Enable device-mapper driver in MONOLITHIC kernels.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.12 2010/08/22 18:56:21 rmind Exp $
d24 2
a26 1
file-system 	FFS		# UFS
a29 1
file-system 	NFS		# Network File System client
@


1.13.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.15 2011/03/06 17:08:26 bouyer Exp $
a23 2
#file-system 	FFS		# UFS
#file-system 	NFS		# Network File System client
d25 1
d29 1
d46 1
a46 2
options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas
@


1.13.4.1
log
@Add QUOTA2 where QUOTA is enabled (and QUOTA2 commented out where QUOTA
is commented out)
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.13 2010/12/15 08:09:02 haad Exp $
d46 1
a46 2
options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas
@


1.13.4.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.14 2011/02/13 04:42:54 jym Exp $
a23 2
#file-system 	FFS		# UFS
#file-system 	NFS		# Network File System client
d25 1
d29 1
@


1.12
log
@Import NPF - a packet filter.  Some features:

- Designed to be fully MP-safe and highly efficient.

- Tables/IP sets (hash or red-black tree) for high performance lookups.

- Stateful filtering and Network Address Port Translation (NAPT).
  Framework for application level gateways (ALGs).

- Packet inspection engine called n-code processor - inspired by BPF -
  supporting generic RISC-like and specific CISC-like instructions for
  common patterns (e.g. IPv4 address matching).  See npf_ncode(9) manual.

- Convenient userland utility npfctl(8) with npf.conf(8).

NOTE: This is not yet a fully capable alternative to PF or IPFilter.
Further work (support for binat/rdr, return-rst/return-icmp, common ALGs,
state saving/restoring, logging, etc) is in progress.

Thanks a lot to Matt Thomas for various useful comments and code review.
Aye by: board@@
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.11 2010/04/09 14:02:05 ahoka Exp $
d67 1
@


1.11
log
@Remove pad from GENERIC, add to MONOLITH, we have it as a module now.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.10 2010/01/01 22:12:19 dholland Exp $
d53 3
@


1.10
log
@add rcsid
@
text
@d1 1
a1 1
# $NetBSD$
d61 3
@


1.10.4.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.10 2010/01/01 22:12:19 dholland Exp $
a60 3

pseudo-device	pad		# pseudo audio device driver

@


1.10.4.2
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD$
a23 2
#file-system 	FFS		# UFS
#file-system 	NFS		# Network File System client
d25 1
d29 1
a52 3
# NPF
#pseudo-device	npf

a63 1
pseudo-device 	dm		# device-mapper device driver
@


1.10.4.3
log
@sync with head
@
text
@d46 1
a46 2
options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas
@


1.10.2.1
log
@Sync with HEAD.
@
text
@a60 3

pseudo-device	pad		# pseudo audio device driver

@


1.10.2.2
log
@Sync with HEAD (-D20101022).
@
text
@a52 3
# NPF
#pseudo-device	npf

@


1.9
log
@Remove the portalfs kernel file system driver.  Replace mount_portal(8)
with a version based on puffs.  User functionality remains the same.
@
text
@d1 1
@


1.8
log
@Make POSIX message queues a kernel module.
@
text
@a35 1
file-system 	PORTAL		# portal filesystem (still experimental)
@


1.7
log
@delete COMPAT_43 that is now in GENERIC
@
text
@d14 2
a15 1
options 	AIO		# POSIX AIO, built as a module
@


1.7.2.1
log
@file MONOLITHIC was added on branch yamt-nfs-mp on 2009-05-04 08:11:15 +0000
@
text
@d1 59
@


1.7.2.2
log
@sync with head.
@
text
@a0 59
#
# Non MODULAR, used mostly as a reference as to what we modularized.
#
include "arch/i386/conf/GENERIC"

no options	MODULAR

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts
options 	COREDUMP

options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
options 	AIO		# POSIX AIO, built as a module

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

# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
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 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
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	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)

options 	QUOTA		# UFS quotas

options 	NFSSERVER

options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP

pseudo-device	accf_data	# "dataready" accept filter
pseudo-device	accf_http	# "httpready" accept filter

pseudo-device	vcoda		4	# coda minicache <-> venus comm.

pseudo-device	nsmb		# experimental - SMB requester

pseudo-device	putter		# for puffs and pud
@


1.7.2.3
log
@sync with head.
@
text
@d14 1
a14 2
options 	AIO		# POSIX asynchronous I/O, built as a module
options 	MQUEUE		# POSIX messsage queues, built as a module
@


1.7.2.4
log
@sync with head
@
text
@a0 1
# $NetBSD$
d36 1
@


1.7.2.5
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.7.2.4 2010/03/11 15:02:27 yamt Exp $
a60 3

pseudo-device	pad		# pseudo audio device driver

@


1.7.2.6
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.7.2.5 2010/08/11 22:52:10 yamt Exp $
a52 3
# NPF
#pseudo-device	npf

@


1.6
log
@need putter too
@
text
@a15 2
options 	COMPAT_43	# and 4.3BSD

@


1.5
log
@file-system PUFFS
@
text
@d60 2
@


1.4
log
@Remove native compatibility options to stop the config(1) errors
that Juergen Hannken-Illjes reports:

    sys/arch/i386/conf/MONOLITHIC:16: already have options `COMPAT_NOMID'
    sys/arch/i386/conf/MONOLITHIC:17: already have options `COMPAT_09'
    ...
@
text
@d45 1
@


1.3
log
@move COMPAT_50 into MONOLITHIC, as pointed out by enami@@.
@
text
@a15 13
options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2,
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_50	# NetBSD 5.0
@


1.3.2.1
log
@Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.
@
text
@d16 15
a57 1
file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
a71 2

pseudo-device	putter		# for puffs and pud
@


1.3.2.2
log
@Sync with HEAD.
@
text
@d14 1
a14 2
options 	AIO		# POSIX asynchronous I/O, built as a module
options 	MQUEUE		# POSIX messsage queues, built as a module
@


1.3.2.3
log
@Sync with HEAD
@
text
@a0 1
# $NetBSD: MONOLITHIC,v 1.12 2010/08/22 18:56:21 rmind Exp $
d36 1
a52 3
# NPF
#pseudo-device	npf

a60 3

pseudo-device	pad		# pseudo audio device driver

@


1.3.2.4
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.13 2010/12/15 08:09:02 haad Exp $
a66 1
pseudo-device 	dm		# device-mapper device driver
@


1.3.2.5
log
@Sync with HEAD. TODO before merge:
- shortcut for suspend code in sysmon, when powerd(8) is not running.
Borrow ``xs_watch'' thread context?
- bug hunting in xbd + xennet resume. Rings are currently thrashed upon
resume, so current implementation force flush them on suspend. It's not
really needed.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.15 2011/03/06 17:08:26 bouyer Exp $
a23 2
#file-system 	FFS		# UFS
#file-system 	NFS		# Network File System client
d25 1
d29 1
d46 1
a46 2
options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas
@


1.3.2.6
log
@More sync fixes. And add the mbr_gpt files.
@
text
@@


1.3.2.7
log
@Sync with HEAD. Most notably: uvm/pmap work done by rmind@@, and MP Xen
work of cherry@@.

No regression observed on suspend/restore.
@
text
@d1 1
a1 1
# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $
d3 1
a3 1
# Non MODULAR
d8 61
@


1.2
log
@make this actually work.
@
text
@d28 1
@


1.2.4.1
log
@file MONOLITHIC was added on branch nick-hppapmap on 2009-01-19 13:16:15 +0000
@
text
@d1 70
@


1.2.4.2
log
@Sync with HEAD.
@
text
@a0 70
#
# Non MODULAR, used mostly as a reference as to what we modularized.
#
include "arch/i386/conf/GENERIC"

no options	MODULAR

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts
options 	COREDUMP

options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
options 	AIO		# POSIX AIO, built as a module

options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2,
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_43	# and 4.3BSD

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

# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
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 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
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

options 	QUOTA		# UFS quotas

options 	NFSSERVER

options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP

pseudo-device	accf_data	# "dataready" accept filter
pseudo-device	accf_http	# "httpready" accept filter

pseudo-device	vcoda		4	# coda minicache <-> venus comm.

pseudo-device	nsmb		# experimental - SMB requester
@


1.2.4.3
log
@Sync with HEAD.
@
text
@a27 1
options 	COMPAT_50	# NetBSD 5.0
@


1.2.4.4
log
@Sync with HEAD.
@
text
@d16 15
a57 1
file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
a71 2

pseudo-device	putter		# for puffs and pud
@


1.2.2.1
log
@file MONOLITHIC was added on branch mjf-devfs2 on 2009-01-17 13:28:03 +0000
@
text
@d1 70
@


1.2.2.2
log
@Sync with HEAD.
@
text
@a0 70
#
# Non MODULAR, used mostly as a reference as to what we modularized.
#
include "arch/i386/conf/GENERIC"

no options	MODULAR

options 	EXEC_AOUT	# exec a.out binaries
options 	EXEC_ELF32	# exec ELF binaries
options 	EXEC_SCRIPT	# exec #! scripts
options 	COREDUMP

options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
options 	AIO		# POSIX AIO, built as a module

options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2,
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_43	# and 4.3BSD

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

# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
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 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
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

options 	QUOTA		# UFS quotas

options 	NFSSERVER

options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP

pseudo-device	accf_data	# "dataready" accept filter
pseudo-device	accf_http	# "httpready" accept filter

pseudo-device	vcoda		4	# coda minicache <-> venus comm.

pseudo-device	nsmb		# experimental - SMB requester
@


1.1
log
@Add a convenience config file to build non-modular kernels for testing purposes.
@
text
@d4 1
a4 1
include "GENERIC"
@

