 @@ -1,499 +1,500 @@
-#	$NetBSD: Makefile.kern.inc,v 1.118 2008/10/25 22:27:38 apb Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.118.4.1 2009/03/15 19:43:48 snj Exp $
+#
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
+#
 # Each target in this file should be protected with `if !target(target)'
 # or `if !commands(target)' and each variable should only be conditionally
 # assigned `VAR ?= VALUE', so that everything can be overriden.
+#
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
+#
 # all ports are expected to include bsd.own.mk for toolchain settings
 ##
 ## (0) toolchain settings for things that aren't part of the standard
 ## toolchain
 ##
 HOST_SH?=	sh
 DBSYM?=		dbsym
 MKDEP?=		mkdep
 STRIP?=		strip
 OBJCOPY?=	objcopy
 OBJDUMP?=	objdump
 CSCOPE?=	cscope
 MKID?=		mkid
 UUDECODE?=	${TOOL_UUDECODE:Uuudecode}
 HEXDUMP?=	${TOOL_HEXDUMP:Uhexdump}
 GENASSYM?=	${TOOL_GENASSYM:Ugenassym}
 .MAKEOVERRIDES+=USETOOLS	# make sure proper value is propagated
 _MKMSG?=		@\#
 _MKSHMSG?=		echo
 _MKSHECHO?=		echo
 _MKMSG_CREATE?=		:
 _MKTARGET_COMPILE?=	:
 _MKTARGET_CREATE?=	:
 ##
 ## (1) port independent source tree identification
 ##
 # source tree is located via $S relative to the compilation directory
 .ifndef S
 S!=	cd ../../../..; pwd
 .endif
 ##
 ## (2) compile settings
 ##
 ## CPPFLAGS, CFLAGS, and AFLAGS must be set in the port's Makefile
 ##
 INCLUDES?=	-I. ${EXTRA_INCLUDES} -I${S}/../common/include -I$S/arch \
 		-I$S -nostdinc
 CPPFLAGS+=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT
 DEFCOPTS?=	-O2
 COPTS?=		${DEFCOPTS}
 COPTS+=		-std=gnu99
 DBG=		# might contain unwanted -Ofoo
 DEFWARNINGS?=	yes
 .if (${DEFWARNINGS} == "yes")
 . if !defined(NOGCCERROR)
 CWARNFLAGS+=	-Werror
 . endif
 CWARNFLAGS+=	-Wall -Wno-main -Wno-format-zero-length -Wpointer-arith
 CWARNFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes
 CWARNFLAGS+=	-Wswitch -Wshadow
 CWARNFLAGS+=	-Wcast-qual -Wwrite-strings
 CWARNFLAGS+=	-Wno-unreachable-code
 # Add -Wno-sign-compare.  -Wsign-compare is included in -Wall as of GCC 3.3,
 # but our sources aren't up for it yet.
 CWARNFLAGS+=	-Wno-sign-compare
 . if (defined(HAVE_GCC) && ${HAVE_GCC} > 3) || defined(HAVE_PCC)
 CWARNFLAGS+=	-Wno-pointer-sign -Wno-attributes
 .  if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
 	${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "prep"
 CWARNFLAGS+=	-Wextra -Wno-unused-parameter
 .  endif
 . endif
 .endif
 CFLAGS+=	-ffreestanding -fno-zero-initialized-in-bss
 CFLAGS+=	${DEBUG} ${COPTS}
 AFLAGS+=	-D_LOCORE -Wa,-fatal-warnings
 # XXX
 .if defined(HAVE_GCC) && ${HAVE_GCC} > 3
 CFLAGS+=	-fno-strict-aliasing
 .endif
 .if ${USE_SSP:Uno} == "yes"
 CFLAGS+=-fstack-protector -Wstack-protector --param ssp-buffer-size=1
 LDFLAGS+=-fstack-protector -Wstack-protector --param ssp-buffer-size=1
 COPTS.kern_ssp.c+=	-fno-stack-protector -D__SSP__
 .endif
 # If we want the bpendtsleep: label in kern_synch.c, we need to use
 # -fno-reorder-blocks.  Don't make this a config(1) defflag without
 # making sure this fragment remains valid.
 .if defined(HAVE_GCC) && ${HAVE_GCC} > 3 && \
 	!empty(${CFLAGS:M-DKERN_SYNCH_BPENDTSLEEP_LABEL})
 COPTS.kern_synch.c+=	-fno-reorder-blocks
 .endif
 # Use the per-source COPTS variables to add -g to just those
 # files that match the shell patterns given in ${DEBUGLIST}
+#
 .for i in ${DEBUGLIST}
 . for j in ${CFILES:T:M$i.c}
 COPTS.${j}+=-g
 . endfor
 .endfor
 # Always compile subr_debug_info.c with debug informations.
 # This allows gdb to use type informations.
+#
 COPTS.debugsyms.c+=	-g
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # NOPROF and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 NORMAL_C?=	@${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}"; \
 		${_MKSHECHO}\
 		${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<; \
 		${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 NOPROF_C?=	@${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}"; \
 		${_MKSHECHO}\
 		${CC} ${CFLAGS} ${CPPFLAGS} -c $<; \
 		${CC} ${CFLAGS} ${CPPFLAGS} -c $<
 NORMAL_S?=	@${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}"; \
 		${_MKSHECHO}\
 		${CC} ${AFLAGS} ${CPPFLAGS} -c $<; \
 		${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 ##
 ## (3) libkern and compat
 ##
 ## Set KERN_AS in the port Makefile to "obj" or "library".  The
 ## default is "library", as documented in $S/lib/libkern/Makefile.inc.
 ##
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
 LIBKERN?=	${KERNLIB}
 .else
 LIBKERN?=	${KERNLIB_PROF}
 .endif
 LIBKERNLN?=	${KERNLIBLN}
 ### find out what to use for libcompat
 .include "$S/compat/common/Makefile.inc"
 .ifndef PROF
 SYSLIBCOMPAT?=	${COMPATLIB}
 .else
 SYSLIBCOMPAT?=	${COMPATLIB_PROF}
 .endif
 SYSLIBCOMPATLN?=	${COMPATLIBLN}
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 ## Each port should have a corresponding section with settings for
 ## MD_CFILES, MD_SFILES, and MD_OBJS, along with build rules for same.
 ##
 MI_CFILES=devsw.c ioconf.c param.c
 # the need for a MI_SFILES variable is dubitable at best
 MI_OBJS=${MI_CFILES:S/.c/.o/}
 param.c: $S/conf/param.c
 	${_MKTARGET_CREATE}
 	rm -f param.c
 	cp $S/conf/param.c .
 param.o: Makefile
 .for _cfile in ${MI_CFILES}
 ${_cfile:T:R}.o: ${_cfile}
 	${NORMAL_C}
 .endfor
 ##
 ## (5) link settings
 ##
 ## TEXTADDR (or LOADADDRESS), LINKFORMAT, and any EXTRA_LINKFLAGS must
 ## be set in the port's Makefile.  The port specific definitions for
 ## LINKFLAGS_NORMAL and LINKFLAGS_DEBUG will added to the LINKFLAGS
 ## depending on the value of DEBUG.
 ##
 # load lines for config "xxx" will be emitted as:
 # xxx: ${SYSTEM_DEP} swapxxx.o
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
 SYSTEM_OBJ?=	${MD_OBJS} ${MI_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
 SYSTEM_DEP?=	Makefile ${SYSTEM_OBJ:O} .gdbinit
 SYSTEM_LD_HEAD?=@rm -f $@
 SYSTEM_LD?=	@${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
 		${_MKSHECHO}\
 		${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
 		${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
 SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \
 		${SIZE} $@; chmod 755 $@
 TEXTADDR?=	${LOADADDRESS}			# backwards compatibility
 LINKTEXT?=	${TEXTADDR:C/.+/-Ttext &/}
 LINKDATA?=	${DATAADDR:C/.+/-Tdata &/}
 ENTRYPOINT?=	start
 LINKENTRY?=	${ENTRYPOINT:C/.+/-e &/}
 LINKFLAGS?=	${LINKFORMAT} ${LINKTEXT} ${LINKDATA} ${LINKENTRY} \
 		${EXTRA_LINKFLAGS}
 LINKFLAGS_DEBUG?=	-X
 SYSTEM_LD_TAIL_DEBUG?=; \
 		echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
 		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
 		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
 LINKFLAGS_NORMAL?=	-S
 STRIPFLAGS?=	-g
 DEBUG?=
 .if !empty(DEBUG:M-g*)
 SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_DEBUG}
 LINKFLAGS+=	${LINKFLAGS_DEBUG}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gdb@}
 .elifndef PROF
 LINKFLAGS+=	${LINKFLAGS_NORMAL}
 .endif
 SYSTEM_LD_TAIL+=; \
 	if grep -q '^\#define.*SYMTAB_SPACE' opt_ddbparam.h; then \
 		echo "${DBSYM} $@"; \
 		${DBSYM} $@; \
 	fi
 SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
 SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_EXTRA}
 ##
 ## (6) port independent targets and dependencies: assym.h, vers.o
 ##
 .if !target(assym.h)
 assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS}
 	${_MKTARGET_CREATE}
 	cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
 	    ${GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
 	    > assym.h.tmp && \
 	mv -f assym.h.tmp assym.h
 ${MD_SFILES:C/\.[Ss]/.o/} ${SFILES:C/\.[Ss]/.o/}: assym.h
 .endif
 .if !target(vers.o)
 newvers: vers.o
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh $S/conf/osrelease.sh
 	${_MKMSG_CREATE} vers.c
 	${HOST_SH} $S/conf/newvers.sh
 	${_MKTARGET_COMPILE}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 .endif
 .if !target(config_time.h)
 BUILDSYMLINKS+=	config_time.src config_time.h
 .endif
 .if defined(MEMORY_DISK_IMAGE)
 md_root_image.h: ${MEMORY_DISK_IMAGE}
 	${_MKTARGET_CREATE}
 	${TOOL_HEXDUMP} -v -e '"\t" 8/1 "0x%02x, " "\n"' ${.ALLSRC} > ${.TARGET}
 # XXX This is only needed when building md_root.o
 CPPFLAGS+=	-DMEMORY_DISK_IMAGE
 md_root.o: md_root_image.h
 .endif
 # depend on MEMORY_DISK_IMAGE configuration
 md_root.o: Makefile
 # depend on root or device configuration
 autoconf.o conf.o: Makefile
 # depend on network or filesystem configuration
 uipc_proto.o vfs_conf.o: Makefile
 # depend on maxusers and CPU configuration
 assym.h machdep.o: Makefile
 ##
 ## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,
 ##                   cscope, mkid
 ##
 ## Any ports that have other stuff to be cleaned up should fill in
 ## EXTRA_CLEAN.  Some ports may want different settings for
 ## KERNLINTFLAGS, MKDEP_CFLAGS, or MKDEP_AFLAGS.
 ##
 .if !target(__CLEANKERNEL)
 __CLEANKERNEL: .USE
 	${_MKMSG} "${.TARGET}ing the kernel objects"
 	rm -f ${KERNELS} eddep tags *.[io] *.ln [a-z]*.s vers.c \
 	    [Ee]rrs linterrs makelinks assym.h.tmp assym.h \
 	    ${EXTRA_KERNELS} ${EXTRA_CLEAN}
 .endif
 .if !target(kernelnames)
 kernelnames:
 	@echo "${KERNELS} ${EXTRA_KERNELS}"
 .endif
 .if !target(__CLEANDEPEND)
 __CLEANDEPEND: .USE
 	echo .depend ${DEPS} | xargs rm -f --
 .endif
 # do not !target these, the kern and compat Makefiles augment them
 cleandir distclean: __CLEANKERNEL __CLEANDEPEND
 clean: __CLEANKERNEL
 depend: .depend
 dependall: depend .WAIT all
 .if !target(.depend)
 MKDEP_AFLAGS?=	${AFLAGS}
 MKDEP_CFLAGS?=	${CFLAGS}
 SSRCS=${MD_SFILES} ${SFILES}
 CSRCS=${MD_CFILES} ${MI_CFILES} ${CFILES}
 SRCS=${SSRCS} ${CSRCS}
 DEPS=	${SRCS:T:O:u:R:S/$/.d/g}
 .for _s in ${SSRCS}
 ${_s:T:R}.d: ${_s} assym.h
 	${_MKTARGET_CREATE}
 	${MKDEP} -f ${.TARGET} -- ${MKDEP_AFLAGS} \
 	    ${CPPFLAGS} ${CPPFLAGS.${_s:T}} ${_s}
 .endfor
 .for _s in ${CSRCS}
 ${_s:T:R}.d: ${_s}
 	${_MKTARGET_CREATE}
 	${MKDEP} -f ${.TARGET} -- ${MKDEP_CFLAGS} \
 	    ${CPPFLAGS} ${CPPFLAGS.${_s:T}} ${_s}
 .endfor
 assym.d: assym.h
 	${_MKTARGET_CREATE}
 	cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
 	    ${GENASSYM} -- ${MKDEP} -f assym.dep -- \
 	    ${CFLAGS} ${CPPFLAGS}
 	${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
 	rm -f assym.dep
 DEPS+=	assym.d
 .depend: ${DEPS}
 	${_MKTARGET_CREATE}
 	echo "${.ALLSRC}" | ${MKDEP} -D
 .endif
 .if !target(lint)
 ALLSFILES?=	${MD_SFILES} ${SFILES}
 LINTSTUBS?=	${ALLSFILES:T:R:C/^.*$/LintStub_&.c/g}
 KERNLINTFLAGS?=	-bcehnxzFS
 NORMAL_LN?=	${LINT} ${KERNLINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i $<
 _lsrc=${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
 LOBJS?= ${_lsrc:T:S/.c$/.ln/g} ${LIBKERNLN} ${SYSLIBCOMPATLN}
 .for _sfile in ${ALLSFILES}
 LintStub_${_sfile:T:R}.c: ${_sfile} assym.h
 	${_MKTARGET_COMPILE}
 	${CC} -E -C ${AFLAGS} ${CPPFLAGS} ${_sfile} | \
 	      ${TOOL_AWK} -f $S/kern/genlintstub.awk >${.TARGET}
 .endfor
 .for _cfile in ${CFILES} ${LINTSTUBS} ${MI_CFILES} ${MD_CFILES}
 ${_cfile:T:R}.ln: ${_cfile}
 	${_MKTARGET_COMPILE}
 	${NORMAL_LN}
 .endfor
 lint: ${LOBJS}
 	${LINT} ${KERNLINTFLAGS} ${CPPFLAGS:M-[IDU]*} ${LOBJS}
 .endif
 # Attempt to do a syntax-only compile of the entire kernel as one entity.
 # Alas, bugs in the GCC C frontend prevent this from completely effective
 # but information can be gleaned from the output.
 syntax-only: ${CFILES} ${MD_CFILES}
 	${CC} -fsyntax-only -combine ${CFLAGS} ${CPPFLAGS} \
 		${CFILES} ${MD_CFILES}
 # List of kernel images that will be installed into the root file system.
 # Some platforms may need to install more than one (e.g. a netbsd.aout file
 # to be loaded directly by the firmware), so this can be overriden by them.
 KERNIMAGES?=	netbsd
 .if !target(install)
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
 MACHINE_NAME!=  uname -n
 install: install-kernel-${MACHINE_NAME}
 .if !target(install-kernel-${MACHINE_NAME})
 install-kernel-${MACHINE_NAME}:
 .for _K in ${KERNIMAGES}
 	rm -f ${DESTDIR}/o${_K}
 	ln ${DESTDIR}/${_K} ${DESTDIR}/o${_K}
 	cp ${_K} ${DESTDIR}/n${_K}
 	mv ${DESTDIR}/n${_K} ${DESTDIR}/${_K}
 .endfor
 .endif
 .endif
 .if !target(tags)
 tags:
 	@echo "see $S/kern/Makefile for tags"
 .endif
 EXTRA_CLEAN+= cscope.out cscope.tmp
 .if !target(cscope.out)
 cscope.out: Makefile depend
 	${_MKTARGET_CREATE}
 	@${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\ *$$//;' lib/kern/.depend \
 	    | tr -s ' ' '\n' \
 	    | ${TOOL_SED} 's|^\([^.\\]\)|lib/kern/\1|;s|^../../||;' \
 	    > cscope.tmp
 	@${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\ *$$//;' lib/compat/.depend \
 	    | tr -s ' ' '\n' \
 	    | ${TOOL_SED} 's|^\([^.\\]\)|lib/compat/\1|;s|^../../||;' \
 	    >> cscope.tmp
 	@echo ${SRCS} | cat - cscope.tmp | tr -s ' ' '\n' | sort -u | \
 	    ${CSCOPE} -k -i - -b `echo ${INCLUDES} | ${TOOL_SED} s/-nostdinc//`
 #	cscope doesn't write cscope.out if it's uptodate, so ensure
 #	make doesn't keep calling cscope when not needed.
 	@rm -f cscope.tmp; touch cscope.out
 .endif
 .if !target(cscope)
 cscope: cscope.out
 	@${CSCOPE} -d
 .endif
 EXTRA_CLEAN+= ID
 .if !target(mkid)
 .PHONY: mkid
 mkid: ID
 ID: Makefile depend
 	${_MKTARGET_CREATE}
 	@${MKID} \
 	    `${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' \
 			lib/kern/.depend lib/compat/.depend \
 		    | tr ' ' '\n' \
 		    | ${TOOL_SED} "s|^../../||" \
 		    | sort -u` \
 	    `${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' \
 			.depend \
 		    | tr ' ' '\n' \
 		    | sort -u`
 .endif
 .include "${S}/gdbscripts/Makefile.inc"
 EXTRA_CLEAN+= .gdbinit
 .gdbinit: Makefile ${S}/gdbscripts/Makefile.inc
 	${_MKTARGET_CREATE}
 	rm -f .gdbinit
 .for __gdbinit in ${SYS_GDBINIT}
 	echo "source ${S}/gdbscripts/${__gdbinit}" >> .gdbinit
 .endfor
 .if defined(GDBINIT) && !empty(GDBINIT)
 .for __gdbinit in ${GDBINIT}
 	echo "source ${__gdbinit}" >> .gdbinit
 .endfor
 .endif
 # The following files use alloca(3) or variable array allocations.
 # Their full name is noted as documentation.
 VARSTACK=dev/cgd.c kern/uipc_socket.c miscfs/genfs/genfs_vnops.c \
     nfs/nfs_bio.c uvm/uvm_bio.c \
     uvm/uvm_pager.c dev/ic/aic7xxx.c dev/ic/aic79xx.c arch/xen/i386/gdt.c \
     dev/ofw/ofw_subr.c
 . if (defined(HAVE_GCC) && ${HAVE_GCC} > 3) || defined(HAVE_PCC)
 .for __varstack in ${VARSTACK}
 COPTS.${__varstack:T} += -Wno-stack-protector
 .endfor
 .endif
 AFLAGS+=	${AOPTS.${.IMPSRC:T}}
 CFLAGS+=	${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}}
 CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
 CWARNFLAGS+=	${CWARNFLAGS.${.IMPSRC:T}}
 .include <bsd.files.mk>
 ##
 ## the end
 ##

 @@ -1,1636 +1,1637 @@
-#	$NetBSD: files,v 1.924 2008/10/15 06:51:20 wrstuden Exp $
+#	$NetBSD: files,v 1.924.4.1 2009/03/15 19:43:48 snj Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 version 	20080610
+#
 # device classes
+#
 devclass disk
 devclass tape
 devclass ifnet
 devclass tty
 devclass audiodev
 devclass displaydev
 devclass bus
 # options understood by the machine-independent part of the kernel
 # (note, these are case-sensitive)
+#
 defflag				INSECURE
 defflag				KMEMSTATS
 defflag				KTRACE
 defflag				MBUFTRACE
 defflag				PTRACE
 defflag				COREDUMP
 defflag opt_modular.h		MODULAR
 defparam			DEFCORENAME
 defparam			HZ
 defparam			MAXUPRC
 defparam			RTC_OFFSET
 defflag	opt_pipe.h		PIPE_SOCKETPAIR PIPE_NODIRECT
 defflag				BUFQ_DISKSORT
 defflag				BUFQ_FCFS
 defflag				BUFQ_PRIOCSCAN
 defflag				BUFQ_READPRIO
 defflag				NEW_BUFQ_STRATEGY	# same as BUFQ_READPRIO
 defflag	opt_sched.h		SCHED_4BSD
 defflag	opt_sched.h		SCHED_M2
 defparam			SOMAXKVA
 defflag	opt_sock_counters.h	SOSEND_COUNTERS
 defflag	opt_sosend_loan.h	SOSEND_NO_LOAN
 defflag	opt_route.h		RTCACHE_DEBUG RTFLUSH_DEBUG
 defflag				MULTIPROCESSOR
 defflag	opt_config.h		INCLUDE_CONFIG_FILE INCLUDE_JUST_CONFIG
 defparam opt_dump.h		DUMP_ON_PANIC
 defflag	opt_callout.h		CALLWHEEL_STATS
 defflag				CPU_IN_CKSUM
 defflag opt_posix.h		P1003_1B_SEMAPHORE
 defflag	opt_sysv.h		SYSVMSG SYSVSEM	SYSVSHM
 defparam opt_sysvparam.h	SHMMAXPGS SEMMNI SEMMNS SEMUME SEMMNU
 defflag	opt_ntp.h		PPS_SYNC NTP
 defflag	opt_ptm.h		NO_DEV_PTM COMPAT_BSDPTY
 defparam opt_kmempages.h	NKMEMPAGES NKMEMPAGES_MIN NKMEMPAGES_MAX
 defflag	opt_malloclog.h		MALLOCLOG
 defparam opt_malloclog.h	MALLOCLOGSIZE
 defflag	opt_malloc_debug.h	MALLOC_DEBUG
 defflag	opt_pool.h		POOL_DIAGNOSTIC
 defparam opt_poollog.h		POOL_LOGSIZE
 defflag	opt_powerhook.h		POWERHOOK_DEBUG
 defflag	opt_revcache.h		NAMECACHE_ENTER_REVERSE
 defflag	opt_execfmt.h		EXEC_AOUT EXEC_COFF EXEC_ECOFF EXEC_ELF32
 				EXEC_ELF64 EXEC_MACHO EXEC_SCRIPT
 				EXEC_ELF_NOTELESS
 defflag	opt_dkwedge.h		DKWEDGE_AUTODISCOVER
 				DKWEDGE_METHOD_BSDLABEL
 				DKWEDGE_METHOD_GPT
 				DKWEDGE_METHOD_MBR
 defflag	opt_veriexec.h		VERIFIED_EXEC_FP_SHA1
 				VERIFIED_EXEC_FP_SHA256
 				VERIFIED_EXEC_FP_SHA384
 				VERIFIED_EXEC_FP_SHA512
 				VERIFIED_EXEC_FP_MD5
 				VERIFIED_EXEC_FP_RMD160
 # Per system call number counts and times
 defflag opt_syscall_stats.h	SYSCALL_STATS
 defflag opt_syscall_stats.h	SYSCALL_TIMES: SYSCALL_STATS
 # Assume cpu_hascounter() returns true - to use disabled rdtsc() (for soekris)
 defflag opt_syscall_stats.h	SYSCALL_TIMES_HASCOUNTER: SYSCALL_TIMES
 file kern/subr_syscall_stats.c	syscall_stats
 defparam opt_pax.h		PAX_MPROTECT
 				PAX_SEGVGUARD
  				PAX_ASLR
  				PAX_ASLR_DELTA_MMAP_LSB
  				PAX_ASLR_DELTA_MMAP_LEN
  				PAX_ASLR_DELTA_STACK_LSB
  				PAX_ASLR_DELTA_STACK_LEN
  				PAX_ASLR_DELTA_PROG_LEN
 defflag	opt_fileassoc.h		FILEASSOC
 defflag	opt_gre.h		GRE_DEBUG
 # Write Ahead Physical Block Logging
 defflag opt_wapbl.h		WAPBL WAPBL_DEBUG
 defparam opt_wapbl.h		WAPBL_DEBUG_PRINT
 # compatibility options
+#
 defflag	opt_sa.h		KERN_SA
 defflag	opt_compat_netbsd.h	COMPAT_40: KERN_SA
 defflag	opt_compat_netbsd.h	COMPAT_30: COMPAT_40
 defflag	opt_compat_netbsd.h	COMPAT_20: COMPAT_30
 defflag	opt_compat_netbsd.h	COMPAT_16: COMPAT_20
 defflag	opt_compat_netbsd.h	COMPAT_15: COMPAT_16
 defflag	opt_compat_netbsd.h	COMPAT_14: COMPAT_15
 defflag	opt_compat_netbsd.h	COMPAT_13: COMPAT_14
 defflag	opt_compat_netbsd.h	COMPAT_12: COMPAT_13
 defflag	opt_compat_netbsd.h	COMPAT_11: COMPAT_12
 defflag	opt_compat_netbsd.h	COMPAT_10: COMPAT_11
 defflag	opt_compat_netbsd.h	COMPAT_09: COMPAT_10
 defflag				COMPAT_OSSAUDIO
 defflag				COMPAT_FREEBSD: COMPAT_30
 defflag				COMPAT_IBCS2
 defflag				COMPAT_IRIX
 defflag				COMPAT_LINUX
 defflag				COMPAT_LINUX32
 defflag				COMPAT_OSF1
 defflag				COMPAT_SUNOS: COMPAT_30
 defflag	opt_compat_svr4.h	COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2
 defflag				COMPAT_ULTRIX
 defflag				COMPAT_NETBSD32
 defflag				COMPAT_AOUT_M68K: COMPAT_40
 defflag				COMPAT_M68K4K
 defflag				COMPAT_MACH
 defflag				COMPAT_DARWIN
 defflag				COMPAT_VAX1K
 defflag				COMPAT_43
 defflag				COMPAT_PECOFF
 defflag	opt_compat_netbsd.h	COMPAT_NOMID
+#
 # Cryptography support.  Include this early, since several things
 # use it.
 # Individual crypto transforms
 include "crypto/arc4/files.arc4"
 include "crypto/des/files.des"
 include "crypto/blowfish/files.blowfish"
 include "crypto/cast128/files.cast128"
 include "crypto/rijndael/files.rijndael"
 include "crypto/skipjack/files.skipjack"
 # General-purpose crypto processing framework.
 include "opencrypto/files.opencrypto"
+#
 # System monitoring framework
+#
 include "dev/sysmon/files.sysmon"
+#
 # Networking protocols
+#
 include "net80211/files.net80211"
 include "netatalk/files.netatalk"
 include "netbt/files.netbt"
 include "netinet/files.netinet"
 include "netinet/files.ipfilter"
 include "netinet6/files.netinet6"
 include "netinet6/files.ipsec"
 include "netipsec/files.netipsec"
 include "netiso/files.netiso"
 include "netnatm/files.netnatm"
 include "netsmb/files.netsmb"
 include "net/files.pf"
 obsolete defflag		CCITT		# obsolete
 obsolete defflag		HDLC		# obsolete
 obsolete defflag		LLC		# obsolete
 obsolete defflag opt_ns.h	NS NSIP		# obsolete
 obsolete defflag		IPX		# obsolete
 obsolete defflag opt_iso.h	TPCONS
 defflag				PFIL_HOOKS	# pfil(9)
 defflag	opt_bridge_ipf.h	BRIDGE_IPF	# bridge(4) use inet_pfil_hooks
 defflag	opt_ppp.h		PPP_DEFLATE PPP_BSDCOMP PPP_FILTER
 						# Include deflate or bsd
 						# compression, enable pppd
 						# packet filtering support
 defflag opt_pppoe.h		PPPOE_SERVER PPPOE_TERM_UNKNOWN_SESSIONS
 # networking options
+#
 defflag				GATEWAY
 defparam opt_nmbclusters.h	NMBCLUSTERS
 defparam			SB_MAX
 # file system options
+#
 defflag				SOFTDEP			# XXX files.ufs?
 defflag				QUOTA			# XXX files.ufs?
 defflag				VNODE_LOCKDEBUG
 defflag				MAGICLINKS
 # buffer cache size options
+#
 defparam opt_bufcache.h		BUFCACHE BUFPAGES
 # userconf
+#
 defflag				USERCONF
 # sysctl related
+#
 defflag opt_sysctl.h		SYSCTL_DISALLOW_CREATE SYSCTL_DISALLOW_KWRITE
 				SYSCTL_DEBUG_SETUP SYSCTL_DEBUG_CREATE
 				SYSCTL_INCLUDE_DESCR
+#
 # Not entirely MI, but present on multiple arch's
+#
 # PC-style MBR handling
+#
 defflag	opt_mbr.h		COMPAT_386BSD_MBRPART
+#
 # debugging options
+#
 include "ddb/files.ddb"		# in-kernel dynamic debugger
 defflag	opt_kgdb.h		KGDB
 defparam opt_kgdb.h		KGDB_DEV KGDB_DEVNAME KGDB_DEVPORT
 				KGDB_DEVADDR KGDB_DEVRATE KGDB_DEVMODE
 defflag				LOCKDEBUG
 defflag				SYSCALL_DEBUG
 defflag	opt_kstack.h		KSTACK_CHECK_MAGIC
 # memory (ram) disk options
+#
 defflag	opt_md.h		MEMORY_DISK_HOOKS MEMORY_DISK_IS_ROOT
 				MEMORY_DISK_DYNAMIC
 defparam opt_md.h		MEMORY_DISK_SERVER=1 MEMORY_DISK_ROOT_SIZE
 				MEMORY_RBFLAGS
 defflag opt_tftproot.h		TFTPROOT TFTPROOT_DEBUG
 # Support for hardware performance monitoring counters
+#
 defflag	opt_perfctrs.h		PERFCTRS
 # Machine-independent device majors assignements
 include "conf/majors"
 # generic attributes
+#
 define	audiobus	{ }
 define	midibus		{ }
 define	midisyn
 define	videobus	{ }
 define	ata	        {[channel = -1]}
 define	sata
 define	scsi_core
 define	scsi		{[channel = -1]}: scsi_core
 define	ata_hl		{[drive = -1]}
 define	atapi		{ }
 define	radiodev	{ }
 define	gpibdev		{[address = -1]}
 define	gpiobus		{ }
 define	onewirebus	{ }
 define 	pckbport	{[slot = -1]}
 define	pckbport_machdep_cnattach
 define	firmload
 # audio device attributes
+#
 define	mulaw
 define	auconv
 define	aurateconv
 # audio and midi devices, attaches to audio hardware driver
+#
 device	audio: audiodev
 attach	audio at audiobus
 device	midi
 attach	midi at midibus
 # console bell via audio device
+#
 define	audiobell
 # video devices, attaches to video hardware driver
+#
 device	video
 attach	video at videobus
 # National Semiconductor LM7[89]
+#
 # (included here so files.i2c can define an attachment)
 device	lm: sysmon_envsys
 file	dev/ic/nslm7x.c			lm			needs-flag
 # I2C device support
 include "dev/i2c/files.i2c"
 # SPI device support
 include "dev/spi/files.spi"
 # IR device support
 include	"dev/ir/files.ir"
 # Parallel Port Bus support
 include "dev/ppbus/files.ppbus"
 # raster operations attributes
+#
 define	rasops1
 define	rasops2
 define	rasops4
 define	rasops8
 define	rasops15
 define	rasops16
 define	rasops24
 define	rasops32
 define	rasops_rotation
 # splash screen support
 include "dev/splash/files.splash"
 # videomode support
 include "dev/videomode/files.videomode"
 # net device attributes - we have generic code for arc(net), ether(net),
 # fddi, token ring, atm and eco(net).
+#
 define	arcnet
 define	atm
 define	eco
 define	ether
 define	fddi
 define	hippi
 define	ieee1394
 define	token
 define	sppp
 define	wlan: arc4, rijndael
 define	crypto
 # devices ARPing IPv4 pull this in:
+#
 define	arp
+#
 # ALTQ network traffic shaping subsystem
+#
 include "altq/files.altq"
+#
 # IPKDB kernel debugger
+#
 include "ipkdb/files.ipkdb"
 # Logical disk
+#
 device	ld: disk
 file	dev/ld.c			ld			needs-flag
+#
 # MII/PHY support for network devices
+#
 include "dev/mii/files.mii"
+#
 # RAIDframe
+#
 include "dev/raidframe/files.raidframe"
+#
 # Hardware-assisted data mover API
+#
 include "dev/dmover/files.dmover"
+#
 # "Chipset" drivers.  These are the bus-independent routines which
 # contain the cfdrivers.  Attachments are provided by files.<bus>
+#
 # Adaptec AIC-6[32]60 ICs
+#
 device	aic: scsi
 file	dev/ic/aic6360.c		aic
 # SMC 93Cx6 Serial EEPROM devices
+#
 define	smc93cx6
 file	dev/ic/smc93cx6.c		smc93cx6
 # Adaptec 2[789]4X, 394X, aic7770 and aic78[5678]0 SCSI controllers
+#
 defparam opt_ahc.h		AHC_DEBUG
 defflag	opt_ahc.h		AHC_NO_TAGS
 device	ahc: scsi
 define	ahc_seeprom
 define	ahc_aic77xx
 file	dev/ic/aic7xxx.c		ahc
 file	dev/ic/aic7xxx_osm.c		ahc
 file	dev/ic/aic7xxx_seeprom.c	ahc_seeprom
 file	dev/ic/aic77xx.c		ahc_aic77xx
 # Adaptec aic79xx SCSI controllers
 defflag	opt_ahd.h		AHD_DEBUG
 device	ahd: scsi
 file	dev/ic/aic79xx.c		ahd
 file	dev/ic/aic79xx_osm.c		ahd
 # DPT EATA SCSI controllers
+#
 device	dpt: scsi
 file	dev/ic/dpt.c			dpt
 # Compaq Smart ARRAY controllers
+#
 device	cac {unit = -1}
 file	dev/ic/cac.c			cac
 attach	ld at cac with ld_cac
 file	dev/ic/ld_cac.c			ld_cac
 # HP/Compaq Command Interface for SCSI-3 Support
+#
 device ciss: scsi
 file	dev/ic/ciss.c			ciss
 # Mylex DAC960 RAID controllers
+#
 device	mlx {unit = -1}
 file	dev/ic/mlx.c			mlx			needs-flag
 attach	ld at mlx with ld_mlx
 file	dev/ic/ld_mlx.c			ld_mlx
 # ICP-Vortex/Intel RAID controllers
+#
 device	icp {unit = -1}
 file	dev/ic/icp.c			icp			needs-flag
 file	dev/ic/icp_ioctl.c		icp
 attach	ld at icp with ld_icp
 file	dev/ic/ld_icp.c			ld_icp
 device	icpsp: scsi
 file	dev/ic/icpsp.c			icpsp
 attach	icpsp at icp
 # Adaptec FSA RAID controllers
+#
 device	aac {unit = -1}
 file	dev/ic/aac.c			aac
 attach	ld at aac with ld_aac
 file	dev/ic/ld_aac.c			ld_aac
 # AdvanSys 1200A, 1200B and ULTRA SCSI controllers
+#
 device	adv: scsi
 file	dev/ic/adv.c			adv
 file	dev/ic/advlib.c			adv
 file	dev/ic/advmcode.c		adv
 # AdvanSys ULTRA WIDE SCSI controllers
+#
 device	adw: scsi
 file	dev/ic/adw.c			adw
 # BusLogic MultiMaster and MultiMaster Ultra SCSI controllers
 # (Must be declared before AHA to ensure bha probes before aha.
 #  Probing AHA first configures bhas as aha, via their AHA
 #  hardware-compatibility mode.)
+#
 device	bha: scsi
 file	dev/ic/bha.c			bha
 # Adaptec AHA-154x and AHA-164x controllers
 # (must be after bha, see above)
+#
 device	aha: scsi
 file	dev/ic/aha.c			aha
 # Initio INIC-940/950 SCSI controllers
+#
 device	iha: scsi
 file	dev/ic/iha.c			iha
 # Qlogic ISP 10x0 SCSI Controllers
+#
 defflag	opt_isp.h		ISP_DISABLE_1020_SUPPORT
 				ISP_DISABLE_1080_SUPPORT
 				ISP_DISABLE_2100_SUPPORT
 				ISP_DISABLE_2200_SUPPORT
 				ISP_DISABLE_2300_SUPPORT
 				ISP_DISABLE_2322_SUPPORT
 				ISP_DISABLE_2400_SUPPORT
 				ISP_DISABLE_FW
 				ISP_TARGET_MODE
 defparam opt_isp.h		ISP_LOGDEFAULT
 				ISP_VPORTS
 device	isp: scsi
 file	dev/ic/isp.c			isp
 file	dev/ic/isp_library.c		isp
 file	dev/ic/isp_netbsd.c		isp
 file	dev/ic/isp_target.c		isp & isp_target_mode
 # LSILogic MegaRAID SAS
+#
 device	mfi: scsi
 file	dev/ic/mfi.c			mfi
 # LSILogic Fusion-MPT I/O Processor SCSI/FC Controllers
+#
 device	mpt: scsi
 file	dev/ic/mpt.c			mpt
 file	dev/ic/mpt_debug.c		mpt
 file	dev/ic/mpt_netbsd.c		mpt
 # Workbit NinjaSCSI-32 controllers
 device	njs: scsi
 file	dev/ic/ninjascsi32.c		njs
 # Symbios/NCR 53c700 SCSI controllers
 device	oosiop: scsi
 file	dev/ic/oosiop.c			oosiop
 # Symbios/NCR 53c710 SCSI controllers
+#
 device	osiop: scsi
 file	dev/ic/osiop.c			osiop
 # common stuff for siop and esiop
+#
 define	siop_common
 file	dev/ic/siop_common.c		siop_common
 # Symbios/NCR 53c720/53c8xx SCSI controllers
+#
 device	siop: scsi,siop_common
 file	dev/ic/siop.c			siop & (siop_pci | siop_gedoens)
 defflag	opt_siop.h			SIOP_SYMLED
 device	esiop: scsi,siop_common
 file	dev/ic/esiop.c			esiop
 # UltraStor SCSI controllers
+#
 device	uha: scsi
 file	dev/ic/uha.c			uha
 # 3Com common probe code
 define  elink
 file    dev/isa/elink.c                 elink
 # Aironet PC4500/PC4800
+#
 device	an: arp, wlan, ifnet
 file	dev/ic/an.c			an
 # AMD 79c930-based 802.11 cards
+#
 device	awi: arp, wlan, ifnet
 file	dev/ic/awi.c			awi
 file	dev/ic/am79c930.c		awi
 # Lucent & Intersil WaveLan IEEE (802.11)
+#
 device	wi: arp, wlan, ifnet
 file	dev/ic/wi.c			wi
 # Atheros 5210/5211/5212 multi-mode 802.11
+#
 defflag	opt_athhal.h	ATHHAL_ASSERT ATHHAL_DEBUG ATHHAL_DEBUG_ALQ
 device	ath: arp, wlan, ifnet
 file	dev/ic/ath.c					ath
 file	dev/ic/ath_netbsd.c				ath
 file	dev/ic/athrate-sample.c				ath
 file	contrib/dev/ath/netbsd/ah_osdep.c		ath
 object	/athhal.o					ath
 # ADMtek ADM8211 802.11
+#
 device	atw: arp, wlan, ifnet, smc93cx6
 file	dev/ic/atw.c			atw
 # Realtek RTL8180 802.11
+#
 device rtw: arp, wlan, ifnet, smc93cx6
 file	dev/ic/rtw.c			rtw
 file	dev/ic/rtwphy.c			rtw
 file	dev/ic/rtwphyio.c		rtw
 # Ralink RT2500/RT2600 802.11
 device	ral: arp, ether, ifnet, wlan, firmload
 file	dev/ic/rt2560.c			ral
 file	dev/ic/rt2661.c			ral
 # 3Com Etherlink-III Ethernet controller
+#
 device	ep: arp, ether, ifnet, mii, mii_bitbang
 file	dev/ic/elink3.c			ep
 # 3Com EtherLink XL Controller
+#
 device	ex: arp, ether, ifnet, mii, mii_bitbang
 file	dev/ic/elinkxl.c		ex
 # DEC EtherWORKS III (LEMAC) Ethernet controllers
+#
 device	lc: arp, ether, ifnet
 file	dev/ic/lemac.c			lc
 # LANCE and PCnet Ethernet controllers
+#
 device	le: arp, ether, ifnet
 define	le24
 define	le32
 file	dev/ic/am7990.c			le24
 file	dev/ic/am79900.c		le32
 file	dev/ic/lance.c			le24 | le32
 # DEC DEPCA-family of LANCE Ethernet controllers
+#
 device	depca { }: le24
 file	dev/ic/depca.c			depca
 attach	le at depca with le_depca
 # Sun HME Ethernet controllers
+#
 device	hme: arp, ether, ifnet, mii
 file	dev/ic/hme.c			hme
 # Sun GEM Ethernet controllers
+#
 device	gem: arp, ether, ifnet, mii
 file	dev/ic/gem.c			gem
 # 8390-family Ethernet controllers
+#
 defflag	opt_ipkdb.h		IPKDB_DP8390
 define	dp8390nic
 file	dev/ic/dp8390.c			dp8390nic | ipkdb_dp8390
 # National Semiconductor DP83905 AT/LANTIC Ethernet media support
+#
 define	dp83905
 file	dev/ic/dp83905.c		dp83905
 # Macronix MX98905 Ethernet controller
 # (use as an attribute for an "ne" bus attachment)
+#
 define	mx98905
 file	dev/ic/mx98905.c		mx98905
 # TROPIC Token-Ring controller
+#
 device	tr: arp, token, ifnet
 file	dev/ic/tropic.c			tr
 # NCR 5380 SCSI Bus Controller
+#
 define	ncr5380sbc
 file	dev/ic/ncr5380sbc.c		ncr5380sbc
 device	nca: scsi, ncr5380sbc
 # Sun sc PAL SCSI Bus Controller
+#
 define	sunscpal
 file	dev/ic/sunscpal.c		sunscpal
 device	ssc: scsi, sunscpal
 # DEC FDDI Chipset
+#
 define	pdq
 file	dev/ic/pdq.c			pdq
 file	dev/ic/pdq_ifsubr.c		pdq
 # Cyclades Cyclom-8/16/32
+#
 device	cy: tty
 file	dev/ic/cy.c			cy			needs-flag
 # Efficient Networks, Inc. ATM interface
+#
 device	en: atm, ifnet
 file	dev/ic/midway.c			en
 # NCR 53x9x or Emulex ESP SCSI Controller
+#
 define	ncr53c9x
 device	esp: scsi, ncr53c9x
 file	dev/ic/ncr53c9x.c		ncr53c9x
 # Fujitsu MB87030/MB89352 SCSI Protocol Controller
 device	spc: scsi
 file	dev/ic/mb89352.c		spc
 # Western Digital WD33C93/WD33C93A SCSI Bus Interface Controller
 define	wd33c93
 file	dev/ic/wd33c93.c		wd33c93
 # Hitachi HD44780 LCD panel controller
 define	hd44780
 file	dev/ic/hd44780_subr.c		hd44780
 file	dev/ic/lcdkp_subr.c		hd44780
 # Matrix keypad
 define	matrixkp
 file	dev/ic/matrixkp_subr.c		matrixkp
 # Hitachi HD64570 serial controller
+#
 define	hd64570
 file	dev/ic/hd64570.c		hd64570
 # Riscom/N2 ISA/PCI Sync Serial Controller
+#
 device	ntwoc: ifnet, hd64570
 # Intel 82586 Ethernet Controller
+#
 define	i82586
 file	dev/ic/i82586.c			i82586
 # Intel 82596 Ethernet Controller
+#
 define	i82596
 file	dev/ic/i82596.c			i82596
 # Intel 82557/82558/82559 Ethernet Controller
+#
 device	fxp: ether, ifnet, arp, mii
 file	dev/ic/i82557.c			fxp
 # SEEQ 8005 Advanced Ethernet Data Link Controller
+#
 define	seeq8005
 file	dev/ic/seeq8005.c		seeq8005
 # SMC 91Cxx Ethernet Controller
+#
 device	sm: arp, ether, ifnet, mii, mii_bitbang
 file	dev/ic/smc91cxx.c		sm
 # SMC 83C170 EPIC/100 Fast Ethernet Controller
+#
 device	epic: arp, ether, ifnet, mii
 file	dev/ic/smc83c170.c		epic
 # DEC SGEC Second Generation Ethernet Controller
+#
 define	sgec
 file	dev/ic/sgec.c			sgec
 # MB86950 Ethernet Controller
+#
 define	mb86950
 file	dev/ic/mb86950.c		mb86950
 # MB8696x Ethernet Controller
+#
 define	mb86960
 file	dev/ic/mb86960.c		mb86960
 # Generic MB8696x Ethernet Controller driver
+#
 device	mbe: arp, ether, ifnet, mb86960
 # Interwave Am78C201 audio driver
+#
 define	interwave
 file	dev/ic/interwave.c		interwave
 # TMS 320av110 MPEG2/audio driver
+#
 define	tms320av110
 file	dev/ic/tms320av110.c		tms320av110
 # Novell NE2000-compatible Ethernet cards, based on the
 # National Semiconductor DS8390.
+#
 defflag	opt_ipkdb.h		IPKDB_NE			: IPKDB_DP8390
 device	ne: ether, ifnet, arp, dp8390nic, mii
 file	dev/ic/ne2000.c			ne | ipkdb_ne
 # 8250/16[45]50-based "com" ports
+#
 defflag	opt_com.h		COM_DEBUG
 # XXX In a perfect world, this would be done with attributes
 defflag	opt_com.h		COM_16650 COM_HAYESP COM_PXA2X0 COM_AU1X00
 				COM_REGMAP
 device	com { } : tty
 file	dev/ic/com.c			com			needs-flag
 # PC-like keyboard controller
+#
 device	pckbc: pckbport
 file	dev/ic/pckbc.c			pckbc			needs-flag
 device	attimer
 file	dev/ic/attimer.c		attimer			needs-flag
 # Cirrus Logic CD240[01] 4-port Multi-Protocol Communications Controller
+#
 device	clmpcc: tty
 file	dev/ic/clmpcc.c			clmpcc			needs-flag
 # Abit uGuru
+#
 device	ug: sysmon_envsys
 file	dev/ic/ug.c			ug			needs-flag
 # Essential Communications Corp. HIPPI Interface
+#
 device	esh: hippi, ifnet
 file	dev/ic/rrunner.c		esh			needs-flag
 # SMC 90c26, SMC 90C56 (and 90C66 if in compat mode) chip driver
+#
 device	bah: ifnet, arcnet, arp
 file	dev/ic/smc90cx6.c		bah
 # OPL2/OPL3 FM synth driver
+#
 device	opl: midibus, midisyn
 file	dev/ic/opl.c			opl
 file	dev/ic/oplinstrs.c		opl
 # MPU401 MIDI UART compatibles
+#
 device	mpu: midibus
 file	dev/ic/mpu.c			mpu			needs-flag
 # AD1848 (CS4248, CS4231, AD1845) audio codec support; used by other drivers
+#
 define	ad1848
 file	dev/ic/ad1848.c			ad1848
 # AMD 7930 audio/ISDN codec
+#
 define	am7930
 file	dev/ic/am7930.c			am7930
 # SPARC `SUNW,audiocs'
+#
 device	audiocs: audiobus, auconv, ad1848
 file	dev/ic/cs4231.c			audiocs
 # AC-97 CODECs
+#
 define	ac97
 file	dev/ic/ac97.c			ac97
 # Oki MSM6258 support code
+#
 define msm6258
 file	dev/ic/msm6258.c		msm6258
 # LSI64854 DMA controller back-end
+#
 define	lsi64854
 file	dev/ic/lsi64854.c		lsi64854
 # Cirrus Logic CL-CD180/1864/1865 multi port serial controller back-end
+#
 define	cd18xx
 file	dev/ic/cd18xx.c			cd18xx
 # Realtek 8019/8029 NE2000-compatible network interface subroutines
+#
 define	rtl80x9
 file	dev/ic/rtl80x9.c		rtl80x9
 # Realtek 8129/8139 Ethernet controllers
+#
 device	rtk: ether, ifnet, arp, mii
 file	dev/ic/rtl81x9.c		rtk | re
 # Realtek 8169 Ethernet controllers
+#
 device	re: ether, ifnet, arp, mii
 file	dev/ic/rtl8169.c		re
 # Common code for ESDI/IDE/etc. controllers
+#
 define	wdc_common
 define	ata_dma
 define	ata_udma
 define	ata_piobm
 device	wdc: ata, wdc_common
 defflag	opt_ata.h	ATADEBUG
 device	atabus: atapi,ata_hl
 attach	atabus at ata
 # The strange expression is to dump ata_* definitions to ata_dma.h.
 file	dev/ic/wdc.c			(ata_dma | ata_udma | ata_piobm | atabus) & atabus & wdc_common	needs-flag
 # Workbit NinjaATA-32 IDE controllers
 device	njata: ata, ata_piobm, wdc_common
 file	dev/ic/ninjaata32.c		njata
 # CHIPS and Technologies 82C7[12][01] Universal Peripheral Controller
+#
 device	upc { [offset = -1] }
 attach	wdc at upc with wdc_upc
 attach	com at upc with com_upc
 attach	lpt at upc with lpt_upc
 file	dev/ic/upc.c			upc
 file	dev/ic/wdc_upc.c		wdc_upc
 file	dev/ic/com_upc.c		com_upc
 file	dev/ic/lpt_upc.c		lpt_upc
 # AHCI-compatible SATA controllers
 define ahcisata_core
 file dev/ic/ahcisata_core.c ahcisata_core
 device ahcisata: ata, ata_dma, ata_udma, sata, ahcisata_core
 # DECchip 21x4x Ethernet controller family, and assorted clones.
+#
 device	tlp: arp, ether, ifnet, mii, mii_bitbang
 file	dev/ic/tulip.c			tlp
 # Adaptec AIC-6915 Ethernet interface
+#
 device	sf: arp, ether, ifnet, mii
 file	dev/ic/aic6915.c		sf
 # Mostek time-of-day clock and NVRAM
+#
 define	mk48txx
 file	dev/ic/mk48txx.c		mk48txx
 # Intersil 7170 time-of-day clock
+#
 define	intersil7170
 file	dev/ic/intersil7170.c		intersil7170
 # National Semiconductor MM58167 time-of-day clock
+#
 define	mm58167
 file	dev/ic/mm58167.c		mm58167
 # Motorola mc146818 (and compatible) time-of-day clock
+#
 define	mc146818
 file	dev/ic/mc146818.c		mc146818
 # Ricoh RS5C313 time of-day-clock
+#
 define	rs5c313
 file	dev/ic/rs5c313.c		rs5c313
 # D-Link DL10019/10022 NE2000-compatible network interface subroutines
+#
 define	dl10019
 file	dev/ic/dl10019.c		dl10019
 # ASIX AX88190 NE2000-compatible network interface subroutines
+#
 define	ax88190
 file	dev/ic/ax88190.c		ax88190
 # WD/SMC 80x3 family, SMC Elite Ultra [8216], SMC EtherEZ
+#
 device	we: ether, ifnet, arp, dp8390nic
 file	dev/ic/we.c			we
 # Allied-Telesis Ethernet driver based on Fujitsu MB8696xA controllers
+#
 device	ate: arp, ether, ifnet, mb86960
 # Fujitsu FMV-18x Ethernet driver based on Fujitsu MB8696xA controllers
+#
 device	fmv: arp, ether, ifnet, mb86960
 file	dev/ic/fmv.c			fmv
 # Crystal Semiconductor CS8900, CS8920, and CS8920M Ethernet
+#
 device	cs: arp, ether, ifnet
 device	tscs: arp, ether, ifnet
 file	dev/ic/cs89x0.c			cs | tscs
 # Radio device attributes
+#
 define	tea5757
 file	dev/ic/tea5757.c		tea5757
 define	lm700x
 file	dev/ic/lm700x.c			lm700x
 # Philips PCF8584 i2c controller
 define	pcf8584
 file	dev/ic/pcf8584.c		pcf8584
 # ACPI power management timer (hardware access, independent of ACPI)
+#
 define acpipmtimer
 file	dev/ic/acpipmtimer.c	acpipmtimer
 device 	hpet
 file 	dev/ic/hpet.c		hpet			needs-flag
 # DRM - Direct Rendering Infrastructure: dev/drm
 define drm {}
 include	dev/drm/files.drm
 # Definitions for wscons
 # device attributes: display, display with emulator, keyboard, and mouse
+#
 define	wsdisplaydev		{[kbdmux = 1]}
 define	wsemuldisplaydev	{[console = -1], [kbdmux = 1]}
 define	wskbddev		{[console = -1], [mux = 1]}
 define	wsmousedev		{[mux = 0]}
 define	vcons
 # attribute to pull in raster support
+#
 define	wsrasteremulops
 # common PC display functions
+#
 defflag	opt_pcdisplay.h		PCDISPLAY_SOFTCURSOR
 define	pcdisplayops
 file	dev/ic/pcdisplay_subr.c	pcdisplayops
 file	dev/ic/pcdisplay_chars.c	pcdisplayops
 # an attribute used by arch specific config files to include /dev/fb* (or
 # equivalent) support - on most archs this is just a NOP (untill, maybe
 # someday when we might make /dev/fb* support MI)
 define	fb
 # VGA graphics
+#
 defparam opt_vga.h		VGA_CONSOLE_SCREENTYPE
 defflag opt_vga.h 		VGA_CONSOLE_ATI_BROKEN_FONTSEL
 defflag opt_vga.h		VGA_RASTERCONSOLE
 defflag opt_vga.h		VGA_RESET
 device	vga: displaydev, wsemuldisplaydev, pcdisplayops, drm
 file	dev/ic/vga.c		vga & !vga_rasterconsole	needs-flag
 file	dev/ic/vga_raster.c	vga_rasterconsole		needs-flag
 file	dev/ic/vga_subr.c	vga | vga_rasterconsole
 file	dev/ic/vga_common.c	vga | vga_rasterconsole
 # Integraphics Systems IGA168x and CyberPro framebuffers (linear non-VGA mode)
+#
 device	igsfb: wsemuldisplaydev, wsrasteremulops, rasops8, vcons
 file	dev/ic/igsfb.c			igsfb			needs-flag
 file	dev/ic/igsfb_subr.c		igsfb
 # STI (hp graphics)
 device	sti: wsemuldisplaydev
 file	dev/ic/sti.c		sti & (sti_pci | sti_gedoens)
 include "dev/wscons/files.wscons"
 include "dev/rasops/files.rasops"
 include "dev/wsfont/files.wsfont"
 include "dev/wsfb/files.wsfb"
 # Attributes which machine-independent bus support can be attached to.
 # These should be defined here, because some of these busses can have
 # devices which provide these attributes, and we'd like to avoid hairy
 # ordering constraints on inclusion of the busses' "files" files.
+#
 define	isabus	{ }			# ISA attachment
 define	eisabus	{ }			# EISA attachment
 define	pcibus	{[bus = -1]}		# PCI attachment
 define	tcbus	{ }			# TurboChannel attachment
 define	mcabus	{ }			# MicroChannel attachment
 define	usbus	{ }			# USB attachment
 define	fwbus	{ }			# IEEE 1394 attachment
 define	vmebus	{ }			# VME bus attachment
 define	acpibus	{ }			# ACPI "bus" attachment
 define	pcmciabus { [controller = -1], [socket = -1]}	# PCMCIA bus attachment
 define	cbbus	{ }			# CardBus attachment
 define	pcmciaslot { }			# PCMCIA slot itself
 # We need the USB bus controllers here so different busses can
 # use them in an 'attach-with'.
 # UHCI USB controller
+#
 defparam USB_MEM_RESERVE
 define	usbroothub
 file	dev/usb/usbroothub_subr.c	usbroothub
 device	uhci: usbus, usbroothub
 file	dev/usb/uhci.c			uhci			needs-flag
 # OHCI USB controller
+#
 device	ohci: usbus, usbroothub
 file	dev/usb/ohci.c			ohci			needs-flag
 # EHCI USB controller
+#
 device	ehci: usbus, usbroothub
 file	dev/usb/ehci.c			ehci			needs-flag
 # SL811HS/T USB controller
 defflag	opt_slhci.h	SLHCI_DEBUG SLHCI_TRY_LSVH SLHCI_PROFILE_TRANSFER
 device	slhci: usbus, usbroothub
 file	dev/ic/sl811hs.c		slhci			needs-flag
 # USB HID processing (as used by bluetooth and usb code)
 define	hid
 file	dev/usb/hid.c			hid
 # Myson MTD803 3-in-1 Fast Ethernet Controller
 device	mtd: arp, ether, ifnet, mii
 file	dev/ic/mtd803.c			mtd
 # radio devices, attaches to radio hardware driver
 device	radio
 attach	radio at radiodev
 # IEEE 1394 controllers
 # (These need to be here since it will have both PCI and CardBus attachments)
+#
 device	fwohci: fwbus
 # Sony Programmable I/O Controller
 device	spic: wsmousedev
 file	dev/ic/spic.c			spic
 # IBM CPC700 PowerPC bridge
 define	cpcbus { addr, [irq=-1] }
 device	cpc: cpcbus, pcibus
 file	dev/ic/cpc700.c			cpc
 attach	com at cpcbus with com_cpcbus
 file	dev/ic/com_cpcbus.c		com_cpcbus
 device	cpctim
 attach	cpctim at cpcbus
 file	dev/ic/timer_cpcbus.c		cpctim
 device	cpciic
 attach	cpciic at cpcbus with iic_cpcbus
 file	dev/ic/iic_cpcbus.c		iic_cpcbus
 # Attribute used by various things that need BPF's virtual machine
+#
 define	bpf_filter
 defparam opt_bpf.h	BPF_BUFSIZE
 # Attributes used by the ISDN subsystem
+#
 define	isdndev		# the ISDN subsystem
 define	passive_isdn	# files needed by passive cards (XXX - protocol
 			# specific)
 define	isdncapi	# ISDN CAPI (http://www.capi.org/)
 # The isac found on the Fritz V2.0 Card.
 define	nisacsx
 file	dev/ic/isacsx.c			nisacsx	needs-flag
 # The 'standard' isac
 define	nisac
 file	dev/ic/isac.c			nisac	needs-flag
 # ISDN cards based on the Siemens ISAC/HSCX chipset (or lookalikes)
+#
 device	isic: isdndev, passive_isdn, nisac
 file	dev/ic/isic.c			isic
 file	dev/ic/isic_l1.c		isic|ifpci|ifritz
 file	dev/ic/isic_l1fsm.c		isic|ifpci|ifritz
 file	dev/ic/hscx.c			isic
 file	dev/ic/isic_bchan.c		isic
 # (old) Diehl active ISDN cards
+#
 #device	daic: isdndev
 #file	dev/ic/daic.c			daic
 # AWM B1/T1
 # XXX: passive_isdn
 device	iavc: isdndev, isdncapi, passive_isdn
 file	dev/ic/iavc.c			iavc
 # legitimate pseudo-devices
+#
 defpseudodev vnd:	disk
 defflag opt_vnd.h	VND_COMPRESSION
 defpseudo ccd:		disk
 defpseudo cgd:		disk, des, blowfish, cast128, rijndael
 defpseudodev md:	disk
 defpseudodev fss:	disk
 defpseudo pty:		tty
 defpseudo rnd
 defpseudo ksyms
 defpseudo nullcons
 defpseudo lockstat
 defpseudo bio:		sysmon_envsys
 defpseudo loop:		ifnet
 defpseudo sl:		ifnet
 defpseudo ppp:		ifnet, bpf_filter
 defpseudo pppoe:	ifnet, ether, sppp
 defpseudo sppp:		ifnet
 defpseudo tun:		ifnet
 defpseudo vlan:		ifnet, ether
 defpseudo bridge:	ifnet, ether
 defpseudo bpfilter:	ifnet, bpf_filter
 defpseudo strip:	ifnet
 defpseudo gre:		ifnet
 defpseudo gif:		ifnet
 defpseudo faith:	ifnet
 defpseudo srt:		ifnet
 defpseudo stf:		ifnet
 defpseudodev tap:	ifnet, ether, arp, bpf_filter
 defpseudo carp:		ifnet, ether, arp, bpf_filter
 defpseudodev etherip:	ifnet, ether, arp, bpf_filter
 defpseudo sequencer
 defpseudo clockctl
 defpseudo irix_kmem
 defpseudo irix_usema
+#
 # Accept filters.  XXX should use another registration/initialization method.
+#
 defpseudo accf_data
 defpseudo accf_http
 # ISDN userland pseudo devices
+#
 defpseudo isdntrc:	isdndev, tty
 defpseudo isdnbchan:	isdndev, tty
 defpseudo isdntel:	isdndev, tty
 defpseudo isdnctl:	isdndev, tty
 defpseudo isdn:		isdndev, tty
 # ISDN network interfaces
 defpseudo irip:		isdndev, ifnet
 defflag opt_irip.h	IRIP_VJ
 defpseudo ippp:		isdndev, sppp, ifnet
 # KTTCP network throughput testing pseudo-device
 defpseudo kttcp
 file	dev/kttcp.c			kttcp		needs-flag
 # Veriexec
 defpseudo veriexec
 file	kern/kern_verifiedexec.c	veriexec
 file	dev/verified_exec.c		veriexec	needs-flag
 # isochronous pseudo device for IEEE 1394, i.LINK or FireWire
 defpseudo fwiso:	ieee1394
 # driver attach / detach user interface
 defpseudo drvctl
 file	kern/kern_drvctl.c		drvctl		needs-flag
 # cpu control
 defpseudo cpuctl
 # pass-to-userspace transporter
 defpseudo putter
 file	dev/putter/putter.c		putter
 # userspace block/char device drivers
 defpseudo pud
 file	dev/pud/pud.c			pud
 file	dev/pud/pud_dev.c		pud
+#
 # File systems
+#
 include "coda/files.coda"
 include "fs/adosfs/files.adosfs"
 include "fs/cd9660/files.cd9660"
 include "fs/efs/files.efs"
 include "fs/filecorefs/files.filecorefs"
 include "fs/hfs/files.hfs"
 include "fs/msdosfs/files.msdosfs"
 include "fs/ntfs/files.ntfs"
 include "fs/ptyfs/files.ptyfs"
 include "fs/puffs/files.puffs"
 include "fs/udf/files.udf"
 include "fs/smbfs/files.smbfs"
 include "fs/sysvbfs/files.sysvbfs"
 include "fs/tmpfs/files.tmpfs"
 include "fs/union/files.union"
 include "miscfs/fdesc/files.fdesc"
 include "miscfs/kernfs/files.kernfs"
 include "miscfs/nullfs/files.nullfs"
 include "miscfs/overlay/files.overlay"
 include "miscfs/portal/files.portal"
 include "miscfs/procfs/files.procfs"
 include "miscfs/umapfs/files.umapfs"
 include "nfs/files.nfs"
 include "ufs/files.ufs"
+#
 # UVM (virtual memory)
+#
 include "uvm/files.uvm"
+#
 # Security models
+#
 include "secmodel/files.secmodel"
+#
 # kernel sources
+#
 file	compat/sa/compat_sa.c
 file	conf/debugsyms.c
 file	dev/auconv.c			auconv | mulaw
 file	dev/audio.c			audio | midi | midibus	needs-flag
 file	dev/audiobell.c			audiobell
 file	dev/aurateconv.c		aurateconv		needs-flag
 file	dev/bio.c			bio			needs-flag
 file	dev/ccd.c			ccd			needs-flag
 file	dev/cgd.c			cgd			needs-flag
 file	dev/cgd_crypto.c		cgd
 file	dev/clock_subr.c
 file	dev/clockctl.c			clockctl		needs-flag
 file	dev/dksubr.c			cgd | xbd | ccd | raid
 file	dev/dkwedge/dk.c
 file	dev/dkwedge/dkwedge_bsdlabel.c	dkwedge_method_bsdlabel
 file	dev/dkwedge/dkwedge_gpt.c	dkwedge_method_gpt
 file	dev/dkwedge/dkwedge_mbr.c	dkwedge_method_mbr
 file	dev/firmload.c			firmload
 file	dev/fss.c			fss			needs-count
 file	dev/lockstat.c			lockstat		needs-flag
 file	dev/md.c			md			needs-count
 file	dev/midi.c			midi | midibus		needs-flag
 file	dev/midictl.c			midisyn
 file	dev/midisyn.c			midisyn
 file	dev/mm.c
 file	dev/mulaw.c			mulaw			needs-flag
 file	dev/nullcons_subr.c		nullcons		needs-flag
 file	dev/radio.c			radio			needs-flag
 file	dev/rnd.c			rnd			needs-flag
 file	dev/rndpool.c			rnd			needs-flag
 file	dev/sequencer.c			sequencer		needs-flag
 file	dev/video.c			video			needs-flag
 file	dev/vnd.c			vnd			needs-flag
 file	kern/bufq_disksort.c		bufq_disksort
 file	kern/bufq_fcfs.c		bufq_fcfs
 file	kern/bufq_priocscan.c		bufq_priocscan
 file	kern/bufq_readprio.c		bufq_readprio | new_bufq_strategy
 file	kern/core_elf32.c		coredump & exec_elf32
 file	kern/core_elf64.c		coredump & exec_elf64
 file	kern/core_netbsd.c		coredump & (exec_aout | exec_coff |
 					     exec_ecoff | exec_macho | lkm)
 file	kern/cnmagic.c
 file	kern/exec_aout.c		exec_aout
 file	kern/exec_conf.c
 file	kern/exec_ecoff.c		exec_ecoff
 file	kern/exec_elf32.c		exec_elf32
 file	kern/exec_elf64.c		exec_elf64
 file	kern/exec_macho.c		exec_macho
 file	kern/exec_script.c		exec_script
 file	kern/exec_subr.c
 file	kern/init_main.c
 file	kern/init_sysctl.c
 file	kern/init_sysent.c
 file	kern/kern_acct.c
 file	kern/kern_auth.c
 file	kern/kern_clock.c
 file	kern/kern_condvar.c
 file	kern/kern_core.c
 file	kern/kern_cpu.c
 file	kern/kern_descrip.c
 file	kern/kern_event.c
 file	kern/kern_exec.c
 file	kern/kern_exit.c
 file	kern/kern_fork.c
 file	kern/kern_idle.c
 file	kern/kern_kthread.c
 file	kern/kern_ktrace.c		ktrace
 file	kern/kern_ksyms.c		ksyms | ddb | lkm needs-flag
 file	kern/kern_lkm.c			lkm
 file	kern/kern_lock.c
 file	kern/kern_lwp.c
 file	kern/kern_malloc.c
 file	kern/kern_malloc_stdtype.c
 file	kern/kern_malloc_debug.c	malloc_debug
 file	kern/kern_module.c
 file	kern/kern_mutex.c
 file	kern/kern_fileassoc.c		fileassoc
 file	kern/kern_ntptime.c
 file	kern/kern_pax.c			pax_mprotect | pax_segvguard
 file	kern/kern_physio.c
 file	kern/kern_pmf.c
 file	kern/kern_proc.c
 file	kern/kern_prot.c
 file	kern/kern_ras.c
 file	kern/kern_rate.c
 file	kern/kern_resource.c
 file	kern/kern_runq.c
 file	kern/kern_rwlock.c
 file	kern/kern_sig.c
 file	kern/kern_sleepq.c
 file	kern/kern_softint.c
 file	kern/kern_ssp.c
 file	kern/kern_stub.c
 file	kern/kern_subr.c
 file	kern/kern_synch.c
 file	kern/kern_sysctl.c
 file	kern/kern_tc.c
 file	kern/kern_time.c
 file	kern/kern_timeout.c
 file	kern/kern_turnstile.c
 file	kern/kern_todr.c
 file	kern/kern_uidinfo.c
 file	kern/kern_uuid.c
 file	kern/kern_xxx.c
 file	kern/kgdb_stub.c		kgdb
 file	kern/sched_4bsd.c		sched_4bsd
 file	kern/sched_m2.c			sched_m2
 file	kern/subr_autoconf.c
 file	kern/subr_blist.c		vmswap
 file	kern/subr_bufq.c
 file	kern/subr_callback.c
 file	kern/subr_debug.c		debug
 file	kern/subr_devsw.c
 file	kern/subr_disk.c
 file	kern/subr_iostat.c
 file	kern/subr_evcnt.c
 file	kern/subr_extent.c
 file	kern/subr_hash.c
 file	kern/subr_kmem.c
 file	kern/subr_kobj.c
 file	kern/subr_lockdebug.c
 file	kern/subr_log.c
 file	kern/subr_percpu.c
 file	kern/subr_pool.c
 file	kern/subr_prf.c
 file	kern/subr_prf2.c
 file	kern/subr_prof.c
 file	kern/subr_once.c
 file	kern/subr_optstr.c
 file	kern/subr_specificdata.c
 file	kern/subr_tftproot.c		tftproot
 file	kern/subr_time.c
 file	kern/subr_userconf.c		userconf
 file	kern/subr_vmem.c
 file	kern/subr_workqueue.c
 file	kern/subr_xcall.c
 file	kern/sys_aio.c
 file	kern/sys_descrip.c
 file	kern/sys_generic.c
 file	kern/sys_module.c
 file	kern/sys_mqueue.c
 file	kern/sys_lwp.c
 file	kern/sys_pipe.c			!pipe_socketpair
 file	kern/sys_pmc.c
 file	kern/sys_process.c		ptrace | ktrace
 file	kern/sys_pset.c
 file	kern/sys_select.c
 file	kern/sys_sig.c
 file	kern/sys_sched.c
 file	kern/sys_socket.c
 file	kern/syscalls.c			syscall_debug
 file	kern/sysv_ipc.c			sysvshm | sysvsem | sysvmsg
 file	kern/sysv_msg.c			sysvmsg
 file	kern/sysv_sem.c			sysvsem
 file	kern/sysv_shm.c			sysvshm
 file	kern/tty.c
 file	kern/tty_conf.c
 file	kern/tty_bsdpty.c		compat_bsdpty
 file	kern/tty_pty.c			pty 			needs-flag
 file	kern/tty_ptm.c			pty
 file	kern/tty_subr.c
 file	kern/tty_tty.c
 file	kern/uipc_accf.c
 file	kern/uipc_domain.c
 file	kern/uipc_mbuf.c
 file	kern/uipc_mbuf2.c
 file	net/link_proto.c
 file	kern/uipc_proto.c
 file	kern/uipc_sem.c			p1003_1b_semaphore
 file	kern/uipc_socket.c
 file	kern/uipc_socket2.c
 file	kern/uipc_syscalls.c
 file	kern/uipc_usrreq.c
 file	kern/vfs_bio.c
 file	kern/vfs_cache.c
 file	kern/vfs_dirhash.c
 file	kern/vfs_getcwd.c
 file	kern/vfs_hooks.c
 file	kern/vfs_init.c
 file	kern/vfs_lockf.c
 file	kern/vfs_lookup.c
 file	kern/vfs_subr.c
 file	kern/vfs_syscalls.c
 file	kern/vfs_trans.c
 file	kern/vfs_vnops.c
 file	kern/vfs_wapbl.c		wapbl
 file	kern/vfs_xattr.c
 file	kern/vnode_if.c
 file	miscfs/deadfs/dead_vnops.c
 file	miscfs/fifofs/fifo_vnops.c
 file	miscfs/genfs/genfs_io.c
 file	miscfs/genfs/genfs_vfsops.c
 file	miscfs/genfs/genfs_vnops.c
 file	miscfs/genfs/layer_subr.c	nullfs | overlay | umapfs | lkm
 file	miscfs/genfs/layer_vfsops.c	nullfs | overlay | umapfs | lkm
 file	miscfs/genfs/layer_vnops.c	nullfs | overlay | umapfs | lkm
 file	miscfs/specfs/spec_vnops.c
 file	miscfs/syncfs/sync_subr.c
 file	miscfs/syncfs/sync_vnops.c
 file	net/bpf.c			bpfilter		needs-flag
 file	net/bpf_filter.c		bpf_filter
 file	net/bsd-comp.c			ppp & ppp_bsdcomp
 file	net/if.c
 file	net/if_arcsubr.c		arcnet			needs-flag
 file	net/if_atmsubr.c		atm
 file	net/if_bridge.c			bridge			needs-flag
 file	net/bridgestp.c			bridge
 file	net/if_ecosubr.c		eco
 file	net/if_etherip.c		etherip			needs-flag
 file	net/if_ethersubr.c		ether | fddi | netatalk | token |
 					    wlan
 file	net/if_faith.c			faith & inet & inet6	needs-flag
 file	net/if_fddisubr.c		fddi			needs-flag
 file	net/if_gif.c			gif			needs-flag
 file	net/if_gre.c			gre			needs-flag
 file	net/if_hippisubr.c		hippi			needs-flag
 file	net/if_ieee1394subr.c		ieee1394
 file	net/if_loop.c			loop			needs-flag
 file	net/if_media.c
 file	net/if_ppp.c			ppp			needs-flag
 file	net/if_srt.c			srt
 file	net/if_stf.c			stf & inet & inet6	needs-flag
 file	net/if_sl.c			sl			needs-flag
 file	net/if_spppsubr.c		sppp
 file	net/if_strip.c			strip			needs-flag
 file	net/if_tokensubr.c		token			needs-flag
 file	net/if_tap.c			tap			needs-flag
 file	net/if_tun.c			tun			needs-flag
 file	net/if_vlan.c			vlan			needs-flag
 file	net/if_pppoe.c			pppoe			needs-flag
 file	net/pfil.c			pfil_hooks | ipfilter | pf
 file	net/ppp-deflate.c		ppp & ppp_deflate
 file	net/ppp_tty.c			ppp
 file	net/net_stats.c
 file	net/radix.c
 file	net/raw_cb.c
 file	net/raw_usrreq.c
 file	net/route.c
 file	net/rtsock.c
 file	net/slcompress.c		sl | ppp | strip | (irip & irip_vj)
 file	net/zlib.c			(ppp & ppp_deflate) | ipsec | opencrypto | vnd_compression
 file	netinet/accf_data.c		accf_data
 file	netinet/accf_http.c		accf_http
 file	netinet/cpu_in_cksum.c		(inet | inet6) & !cpu_in_cksum
 file	netinet/if_arp.c		arp | netatalk		needs-flag
 file	netinet/if_atm.c		atm
 file	netinet/in4_cksum.c		inet
 file	netinet/in_cksum.c		inet
 file	netinet/in_gif.c		gif & inet
 file	netinet/ip_carp.c		carp & (inet | inet6)	needs-flag
 file	netinet/ip_ecn.c		ipsec | fast_ipsec | gif | stf
 file	netinet/ip_encap.c		inet | inet6
 file	netinet/ip_etherip.c		etherip & inet
 file	netinet6/ip6_etherip.c		etherip & inet6
 file	netinet6/in6_gif.c		gif & inet6
 file	netisdn/i4b_ctl.c		isdnctl			needs-flag
 file	netisdn/i4b_isppp.c		ippp			needs-count
 file	netisdn/i4b_ipr.c		irip			needs-count
 file	netisdn/i4b_rbch.c		isdnbchan		needs-count
 file	netisdn/i4b_tel.c		isdntel			needs-count
 file	netisdn/i4b_trace.c		isdntrc			needs-count
 file	netisdn/i4b_mbuf.c		passive_isdn
 file	netisdn/i4b_l2.c		passive_isdn
 file	netisdn/i4b_l2fsm.c		passive_isdn
 file	netisdn/i4b_uframe.c		passive_isdn
 file	netisdn/i4b_tei.c		passive_isdn
 file	netisdn/i4b_sframe.c		passive_isdn
 file	netisdn/i4b_iframe.c		passive_isdn
 file	netisdn/i4b_l2timer.c		passive_isdn
 file	netisdn/i4b_util.c		passive_isdn
 file	netisdn/i4b_lme.c		passive_isdn
 # Q.931 handler
 file	netisdn/i4b_q931.c		passive_isdn
 file	netisdn/i4b_q932fac.c		passive_isdn
 file	netisdn/i4b_l3fsm.c		passive_isdn
 file	netisdn/i4b_l3timer.c		passive_isdn
 file	netisdn/i4b_l2if.c		passive_isdn
 file	netisdn/i4b_l4if.c		passive_isdn
 # isdn device driver, interface to isdnd
 file	netisdn/i4b_i4bdrv.c		isdn			needs-flag
 file	netisdn/i4b_l4.c		isdndev			needs-flag
 file	netisdn/i4b_l4mgmt.c		isdndev			needs-flag
 file	netisdn/i4b_l4timer.c		isdndev			needs-flag
 # capi
 file	netisdn/i4b_capi_l4if.c		isdncapi
 file	netisdn/i4b_capi_llif.c		isdncapi
 file	netisdn/i4b_capi_msgs.c		isdncapi
 # Game adapter (joystick)
 device	joy
 file	dev/ic/joy.c			joy needs-flag
 include	"net/agr/files.agr"
+#
 # General Purpose Input/Output framework
+#
 define	onewire_bitbang
 include	"dev/gpio/files.gpio"
 include "dev/onewire/files.onewire"
+#
 # Pseudo audio device
+#
 include "dev/pad/files.pad"
+#
 # Intel 386 Real Mode emulator
+#
 include "lib/libx86emu/files.x86emu"
+#
 # "tprof" profiler.
+#
 include	"dev/tprof/files.tprof"

 @@ -1,941 +1,899 @@
-/*	$NetBSD: init_main.c,v 1.371 2008/10/28 15:33:10 tsutsui Exp $	*/
+/*	$NetBSD: init_main.c,v 1.371.2.1 2009/03/15 19:43:48 snj Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 /*
  * Copyright (c) 1995 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.371 2008/10/28 15:33:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.371.2.1 2009/03/15 19:43:48 snj Exp $");
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_posix.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_wapbl.h"
 #include "rnd.h"
 #include "sysmon_envsys.h"
 #include "sysmon_power.h"
 #include "sysmon_taskq.h"
 #include "sysmon_wdog.h"
 #include "veriexec.h"
 #include <sys/param.h>
 #include <sys/acct.h>
 #include <sys/filedesc.h>
 #include <sys/file.h>
 #include <sys/errno.h>
 #include <sys/callout.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/fstrans.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/percpu.h>
 #include <sys/pset.h>
 #include <sys/sysctl.h>
 #include <sys/reboot.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
 #include <sys/event.h>
 #include <sys/mbuf.h>
 #include <sys/sched.h>
 #include <sys/sleepq.h>
 #include <sys/iostat.h>
 #include <sys/vmem.h>
 #include <sys/uuid.h>
 #include <sys/extent.h>
 #include <sys/disk.h>
 #include <sys/mqueue.h>
 #include <sys/msgbuf.h>
 #include <sys/module.h>
 #include <sys/event.h>
 #include <sys/lockf.h>
 #include <sys/once.h>
 #include <sys/ksyms.h>
 #include <sys/uidinfo.h>
 #ifdef FAST_IPSEC
 #include <netipsec/ipsec.h>
 #endif
 #ifdef SYSVSHM
 #include <sys/shm.h>
 #endif
 #ifdef SYSVSEM
 #include <sys/sem.h>
 #endif
 #ifdef SYSVMSG
 #include <sys/msg.h>
 #endif
 #ifdef P1003_1B_SEMAPHORE
 #include <sys/ksem.h>
 #endif
 #include <sys/domain.h>
 #include <sys/namei.h>
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
 #include <sys/pipe.h>
 #ifdef LKM
 #include <sys/lkm.h>
 #endif
 #if NVERIEXEC > 0
 #include <sys/verified_exec.h>
 #endif /* NVERIEXEC > 0 */
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
 #include <sys/kauth.h>
 #ifdef WAPBL
 #include <sys/wapbl.h>
 #endif
 #include <net80211/ieee80211_netbsd.h>
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #if defined(PAX_MPROTECT) || defined(PAX_SEGVGUARD) || defined(PAX_ASLR)
 #include <sys/pax.h>
 #endif /* PAX_MPROTECT || PAX_SEGVGUARD || PAX_ASLR */
 #include <ufs/ufs/quota.h>
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/syncfs/syncfs.h>
 #include <sys/cpu.h>
 #include <uvm/uvm.h>
 #if NSYSMON_TASKQ > 0
 #include <dev/sysmon/sysmon_taskq.h>
 #endif
 #include <dev/cons.h>
 #if NSYSMON_ENVSYS > 0 || NSYSMON_POWER > 0 || NSYSMON_WDOG > 0
 #include <dev/sysmon/sysmonvar.h>
 #endif
 #include <net/if.h>
 #include <net/raw_cb.h>
 #include <secmodel/secmodel.h>
 extern struct proc proc0;
 extern struct lwp lwp0;
 extern struct cwdinfo cwdi0;
 extern time_t rootfstime;
 #ifndef curlwp
 struct	lwp *curlwp = &lwp0;
 #endif
 struct	proc *initproc;
 struct	vnode *rootvp, *swapdev_vp;
 int	boothowto;
 int	cold = 1;			/* still working on startup */
 struct timeval boottime;	        /* time at system startup - will only follow settime deltas */
 int	start_init_exec;		/* semaphore for start_init() */
 static void check_console(struct lwp *l);
 static void start_init(void *);
 void main(void);
 void ssp_init(void);
 #if defined(__SSP__) || defined(__SSP_ALL__)
 long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 void __stack_chk_fail(void);
 void
 __stack_chk_fail(void)
 	panic("stack overflow detected; terminated");
 void
 ssp_init(void)
 	int s;
 #ifdef DIAGNOSTIC
 	printf("Initializing SSP:");
 #endif
 	/*
 	 * We initialize ssp here carefully:
 	 *	1. after we got some entropy
 	 *	2. without calling a function
 	 */
 	size_t i;
 	long guard[__arraycount(__stack_chk_guard)];
 	arc4randbytes(guard, sizeof(guard));
 	s = splhigh();
 	for (i = 0; i < __arraycount(guard); i++)
 		__stack_chk_guard[i] = guard[i];
 	splx(s);
 #ifdef DIAGNOSTIC
 	for (i = 0; i < __arraycount(guard); i++)
 		printf("%lx ", guard[i]);
 	printf("\n");
 #endif
 #else
 void
 ssp_init(void)
 #endif
 void __secmodel_none(void);
 __weak_alias(secmodel_start,__secmodel_none);
 void
 __secmodel_none(void)
+{
 	return;
+}
 /*
  * System startup; initialize the world, create process 0, mount root
  * filesystem, and fork to create init and pagedaemon.  Most of the
  * hard work is done in the lower-level initialization routines including
  * startup(), which does memory initialization and autoconfiguration.
  */
 void
 main(void)
+{
 	struct timeval time;
 	struct lwp *l;
 	struct proc *p;
 	int s, error;
 #ifdef NVNODE_IMPLICIT
 	int usevnodes;
 #endif
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	l = &lwp0;
 #ifndef LWP0_CPU_INFO
 	l->l_cpu = curcpu();
 #endif
 	/*
 	 * Attempt to find console and initialize
 	 * in case of early panic or other messages.
 	 */
 	consinit();
 	kernel_lock_init();
 	once_init();
 	uvm_init();
 	percpu_init();
 	/* Initialize lock caches. */
 	mutex_obj_init();
 	/* Initialize the extent manager. */
 	extent_init();
 	/* Do machine-dependent initialization. */
 	cpu_startup();
 	/* Initialize callouts, part 1. */
 	callout_startup();
 	/*
 	 * Initialize the kernel authorization subsystem and start the
 	 * default security model, if any. We need to do this early
 	 * enough so that subsystems relying on any of the aforementioned
 	 * can work properly. Since the security model may dictate the
 	 * credential inheritance policy, it is needed at least before
 	 * any process is created, specifically proc0.
 	 */
 	kauth_init();
 	secmodel_start();
 	/* Initialize the buffer cache */
 	bufinit();
 	/* Initialize sockets. */
 	soinit();
 	/*
 	 * The following things must be done before autoconfiguration.
 	 */
 	evcnt_init();		/* initialize event counters */
 #if NRND > 0
 	rnd_init();		/* initialize random number generator */
 #endif
 	/* Initialize process and pgrp structures. */
 	procinit();
 	lwpinit();
 	/* Initialize signal-related data structures. */
 	signal_init();
 	/* Initialize resource management. */
 	resource_init();
 	/* Create process 0 (the swapper). */
 	proc0_init();
 	/* Initialize the UID hash table. */
 	uid_init();
 	/* Charge root for one process. */
 	(void)chgproccnt(0, 1);
 	/* Initialize timekeeping. */
 	time_init();
 	/* Initialize the run queues, turnstiles and sleep queues. */
 	mutex_init(&cpu_lock, MUTEX_DEFAULT, IPL_NONE);
 	sched_rqinit();
 	turnstile_init();
 	sleeptab_init(&sleeptab);
 	/* Initialize processor-sets */
 	psets_init();
 	/* MI initialization of the boot cpu */
 	error = mi_cpu_attach(curcpu());
 	KASSERT(error == 0);
 	/* Initialize timekeeping, part 2. */
 	time_init2();
 	/*
 	 * Initialize mbuf's.  Do this now because we might attempt to
 	 * allocate mbufs or mbuf clusters during autoconfiguration.
 	 */
 	mbinit();
 	/* Initialize the sysctl subsystem. */
 	sysctl_init();
 	/* Initialize I/O statistics. */
 	iostat_init();
 	/* Initialize the log device. */
 	loginit();
 	/* Start module system. */
 	module_init();
 	/* Initialize the file systems. */
 #ifdef NVNODE_IMPLICIT
 	/*
 	 * If maximum number of vnodes in namei vnode cache is not explicitly
 	 * defined in kernel config, adjust the number such as we use roughly
 	 * 10% of memory for vnodes and associated data structures in the
 	 * assumed worst case.  Do not provide fewer than NVNODE vnodes.
 	 */
 	usevnodes =
 	    calc_cache_size(kernel_map, 10, VNODE_VA_MAXPCT) / VNODE_COST;
 	if (usevnodes > desiredvnodes)
 		desiredvnodes = usevnodes;
 #endif
 	vfsinit();
 	lf_init();
 	/* Initialize fstrans. */
 	fstrans_init();
 	/* Initialize the file descriptor system. */
 	fd_sys_init();
 	/* Initialize kqueue. */
 	kqueue_init();
 	/* Initialize asynchronous I/O. */
 	aio_sysinit();
 	/* Initialize message queues. */
 	mqueue_sysinit();
 	/* Initialize the system monitor subsystems. */
 #if NSYSMON_TASKQ > 0
 	sysmon_task_queue_preinit();
 #endif
 #if NSYSMON_ENVSYS > 0
 	sysmon_envsys_init();
 #endif
 #if NSYSMON_POWER > 0
 	sysmon_power_init();
 #endif
 #if NSYSMON_WDOG > 0
 	sysmon_wdog_init();
 #endif
 	inittimecounter();
 	ntp_init();
 	/* Initialize the device switch tables. */
 	devsw_init();
 	/* Initialize tty subsystem. */
 	tty_init();
 	ttyldisc_init();
 	/* Initialize the buffer cache, part 2. */
 	bufinit2();
 	/* Initialize the disk wedge subsystem. */
 	dkwedge_init();
 	/* Initialize interfaces. */
 	ifinit1();
 	/* Configure the system hardware.  This will enable interrupts. */
 	configure();
 	ssp_init();
 	configure2();
 	ubc_init();		/* must be after autoconfig */
 #ifdef SYSVSHM
 	/* Initialize System V style shared memory. */
 	shminit();
 #endif
 #ifdef SYSVSEM
 	/* Initialize System V style semaphores. */
 	seminit();
 #endif
 #ifdef SYSVMSG
 	/* Initialize System V style message queues. */
 	msginit();
 #endif
 #ifdef P1003_1B_SEMAPHORE
 	/* Initialize posix semaphores */
 	ksem_init();
 #endif
 #if NVERIEXEC > 0
 	/*
 	 * Initialise the Veriexec subsystem.
 	 */
 	veriexec_init();
 #endif /* NVERIEXEC > 0 */
 #if defined(PAX_MPROTECT) || defined(PAX_SEGVGUARD) || defined(PAX_ASLR)
 	pax_init();
 #endif /* PAX_MPROTECT || PAX_SEGVGUARD || PAX_ASLR */
 #ifdef	FAST_IPSEC
 	/* Attach network crypto subsystem */
 	ipsec_attach();
 #endif
 	/*
 	 * Initialize protocols.  Block reception of incoming packets
 	 * until everything is ready.
 	 */
 	s = splnet();
 	ifinit();
 	domaininit();
 	if_attachdomain();
 	splx(s);
 #ifdef GPROF
 	/* Initialize kernel profiling. */
 	kmstartup();
 #endif
 	/* Initialize system accounting. */
 	acct_init();
 #ifndef PIPE_SOCKETPAIR
 	/* Initialize pipes. */
 	pipe_init();
 #endif
 #ifdef KTRACE
 	/* Initialize ktrace. */
 	ktrinit();
 #endif
 	/* Initialize the UUID system calls. */
 	uuid_init();
 #ifdef WAPBL
 	/* Initialize write-ahead physical block logging. */
 	wapbl_init();
 #endif
 	/*
 	 * Create process 1 (init(8)).  We do this now, as Unix has
 	 * historically had init be process 1, and changing this would
 	 * probably upset a lot of people.
+	 *
 	 * Note that process 1 won't immediately exec init(8), but will
 	 * wait for us to inform it that the root file system has been
 	 * mounted.
 	 */
 	if (fork1(l, 0, SIGCHLD, NULL, 0, start_init, NULL, NULL, &initproc))
 		panic("fork init");
 	/*
 	 * Load any remaining builtin modules, and hand back temporary
 	 * storage to the VM system.
 	 */
 	module_init_class(MODULE_CLASS_ANY);
 	/*
 	 * Finalize configuration now that all real devices have been
 	 * found.  This needs to be done before the root device is
 	 * selected, since finalization may create the root device.
 	 */
 	config_finalize();
 	/*
 	 * Now that autoconfiguration has completed, we can determine
 	 * the root and dump devices.
 	 */
 	cpu_rootconf();
 	cpu_dumpconf();
 	/* Mount the root file system. */
 	do {
 		domountroothook();
 		if ((error = vfs_mountroot())) {
 			printf("cannot mount root, error = %d\n", error);
 			boothowto |= RB_ASKNAME;
 			setroot(root_device,
 			    (rootdev != NODEV) ? DISKPART(rootdev) : 0);
+		}
 	} while (error != 0);
 	mountroothook_destroy();
 	/*
 	 * Initialise the time-of-day clock, passing the time recorded
 	 * in the root filesystem (if any) for use by systems that
 	 * don't have a non-volatile time-of-day device.
 	 */
 	inittodr(rootfstime);
 	CIRCLEQ_FIRST(&mountlist)->mnt_flag |= MNT_ROOTFS;
 	CIRCLEQ_FIRST(&mountlist)->mnt_op->vfs_refcount++;
 	/*
 	 * Get the vnode for '/'.  Set filedesc0.fd_fd.fd_cdir to
 	 * reference it.
 	 */
 	error = VFS_ROOT(CIRCLEQ_FIRST(&mountlist), &rootvnode);
 	if (error)
 		panic("cannot find root vnode, error=%d", error);
 	cwdi0.cwdi_cdir = rootvnode;
 	VREF(cwdi0.cwdi_cdir);
 	VOP_UNLOCK(rootvnode, 0);
 	cwdi0.cwdi_rdir = NULL;
 	/*
 	 * Now that root is mounted, we can fixup initproc's CWD
 	 * info.  All other processes are kthreads, which merely
 	 * share proc0's CWD info.
 	 */
 	initproc->p_cwdi->cwdi_cdir = rootvnode;
 	VREF(initproc->p_cwdi->cwdi_cdir);
 	initproc->p_cwdi->cwdi_rdir = NULL;
 	/*
 	 * Now can look at time, having had a chance to verify the time
 	 * from the file system.  Reset l->l_rtime as it may have been
 	 * munched in mi_switch() after the time got set.
 	 */
 	getmicrotime(&time);
 	boottime = time;
 	mutex_enter(proc_lock);
 	LIST_FOREACH(p, &allproc, p_list) {
 		KASSERT((p->p_flag & PK_MARKER) == 0);
 		mutex_enter(p->p_lock);
 		p->p_stats->p_start = time;
 		LIST_FOREACH(l, &p->p_lwps, l_sibling) {
 			lwp_lock(l);
 			memset(&l->l_rtime, 0, sizeof(l->l_rtime));
 			lwp_unlock(l);
+		}
 		mutex_exit(p->p_lock);
+	}
 	mutex_exit(proc_lock);
 	binuptime(&curlwp->l_stime);
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		ci->ci_schedstate.spc_lastmod = time_second;
+	}
 	/* Create the pageout daemon kernel thread. */
 	uvm_swap_init();
 	if (kthread_create(PRI_PGDAEMON, KTHREAD_MPSAFE, NULL, uvm_pageout,
 	    NULL, NULL, "pgdaemon"))
 		panic("fork pagedaemon");
 	/* Create the filesystem syncer kernel thread. */
 	if (kthread_create(PRI_IOFLUSH, KTHREAD_MPSAFE, NULL, sched_sync,
 	    NULL, NULL, "ioflush"))
 		panic("fork syncer");
 	/* Create the aiodone daemon kernel thread. */
 	if (workqueue_create(&uvm.aiodone_queue, "aiodoned",
 	    uvm_aiodone_worker, NULL, PRI_VM, IPL_NONE, WQ_MPSAFE))
 		panic("fork aiodoned");
 	vmem_rehash_start();
 	/* Initialize exec structures */
 	exec_init(1);
 	/*
 	 * Okay, now we can let init(8) exec!  It's off to userland!
 	 */
 	mutex_enter(proc_lock);
 	start_init_exec = 1;
 	cv_broadcast(&lbolt);
 	mutex_exit(proc_lock);
 	/* The scheduler is an infinite loop. */
 	uvm_scheduler();
 	/* NOTREACHED */
+}
 static void
 check_console(struct lwp *l)
+{
 	struct nameidata nd;
 	int error;
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, "/dev/console");
 	error = namei(&nd);
 	if (error == 0)
 		vrele(nd.ni_vp);
 	else if (error == ENOENT)
 		printf("warning: no /dev/console\n");
 	else
 		printf("warning: lookup /dev/console: error %d\n", error);
+}
 /*
  * List of paths to try when searching for "init".
  */
 static const char * const initpaths[] = {
 	"/sbin/init",
 	"/sbin/oinit",
 	"/sbin/init.bak",
 	NULL,
 };
 /*
  * Start the initial user process; try exec'ing each pathname in "initpaths".
  * The program is invoked with one argument containing the boot flags.
  */
 static void
 start_init(void *arg)
+{
 	struct lwp *l = arg;
 	struct proc *p = l->l_proc;
 	vaddr_t addr;
 	struct sys_execve_args /* {
 		syscallarg(const char *) path;
 		syscallarg(char * const *) argp;
 		syscallarg(char * const *) envp;
 	} */ args;
 	int options, i, error;
 	register_t retval[2];
 	char flags[4], *flagsp;
 	const char *path, *slash;
 	char *ucp, **uap, *arg0, *arg1 = NULL;
 	char ipath[129];
 	int ipx, len;
 	/*
 	 * Now in process 1.
 	 */
 	strncpy(p->p_comm, "init", MAXCOMLEN);
 	/*
 	 * Wait for main() to tell us that it's safe to exec.
 	 */
 	mutex_enter(proc_lock);
 	while (start_init_exec == 0)
 		cv_wait(&lbolt, proc_lock);
 	mutex_exit(proc_lock);
 	/*
 	 * This is not the right way to do this.  We really should
 	 * hand-craft a descriptor onto /dev/console to hand to init,
 	 * but that's a _lot_ more work, and the benefit from this easy
 	 * hack makes up for the "good is the enemy of the best" effect.
 	 */
 	check_console(l);
 	/*
 	 * Need just enough stack to hold the faked-up "execve()" arguments.
 	 */
 	addr = (vaddr_t)STACK_ALLOC(USRSTACK, PAGE_SIZE);
 	if (uvm_map(&p->p_vmspace->vm_map, &addr, PAGE_SIZE,
                     NULL, UVM_UNKNOWN_OFFSET, 0,
                     UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_COPY,
 		    UVM_ADV_NORMAL,
                     UVM_FLAG_FIXED|UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW)) != 0)
 		panic("init: couldn't allocate argument space");
 	p->p_vmspace->vm_maxsaddr = (void *)STACK_MAX(addr, PAGE_SIZE);
 	ipx = 0;
 	while (1) {
 		if (boothowto & RB_ASKNAME) {
 			printf("init path");
 			if (initpaths[ipx])
 				printf(" (default %s)", initpaths[ipx]);
 			printf(": ");
 			len = cngetsn(ipath, sizeof(ipath)-1);
 			if (len == 4 && strcmp(ipath, "halt") == 0) {
 				cpu_reboot(RB_HALT, NULL);
 			} else if (len == 6 && strcmp(ipath, "reboot") == 0) {
 				cpu_reboot(0, NULL);
 #if defined(DDB)
 			} else if (len == 3 && strcmp(ipath, "ddb") == 0) {
 				console_debugger();
 				continue;
 #endif
 			} else if (len > 0 && ipath[0] == '/') {
 				ipath[len] = '\0';
 				path = ipath;
 			} else if (len == 0 && initpaths[ipx] != NULL) {
 				path = initpaths[ipx++];
 			} else {
 				printf("use absolute path, ");
 #if defined(DDB)
 				printf("\"ddb\", ");
 #endif
 				printf("\"halt\", or \"reboot\"\n");
 				continue;
+			}
 		} else {
 			if ((path = initpaths[ipx++]) == NULL) {
 				ipx = 0;
 				boothowto |= RB_ASKNAME;
 				continue;
+			}
+		}
 		ucp = (char *)USRSTACK;
 		/*
 		 * Construct the boot flag argument.
 		 */
 		flagsp = flags;
 		*flagsp++ = '-';
 		options = 0;
 		if (boothowto & RB_SINGLE) {
 			*flagsp++ = 's';
 			options = 1;
+		}
 #ifdef notyet
 		if (boothowto & RB_FASTBOOT) {
 			*flagsp++ = 'f';
 			options = 1;
+		}
 #endif
 		/*
 		 * Move out the flags (arg 1), if necessary.
 		 */
 		if (options != 0) {
 			*flagsp++ = '\0';
 			i = flagsp - flags;
 #ifdef DEBUG
 			printf("init: copying out flags `%s' %d\n", flags, i);
 #endif
 			arg1 = STACK_ALLOC(ucp, i);
 			ucp = STACK_MAX(arg1, i);
 			(void)copyout((void *)flags, arg1, i);
+		}
 		/*
 		 * Move out the file name (also arg 0).
 		 */
 		i = strlen(path) + 1;
 #ifdef DEBUG
 		printf("init: copying out path `%s' %d\n", path, i);
 #else
 		if (boothowto & RB_ASKNAME || path != initpaths[0])
 			printf("init: trying %s\n", path);
 #endif
 		arg0 = STACK_ALLOC(ucp, i);
 		ucp = STACK_MAX(arg0, i);
 		(void)copyout(path, arg0, i);
 		/*
 		 * Move out the arg pointers.
 		 */
 		ucp = (void *)STACK_ALIGN(ucp, ALIGNBYTES);
 		uap = (char **)STACK_ALLOC(ucp, sizeof(char *) * 3);
 		SCARG(&args, path) = arg0;
 		SCARG(&args, argp) = uap;
 		SCARG(&args, envp) = NULL;
 		slash = strrchr(path, '/');
 		if (slash)
 			(void)suword((void *)uap++,
 			    (long)arg0 + (slash + 1 - path));
 		else
 			(void)suword((void *)uap++, (long)arg0);
 		if (options != 0)
 			(void)suword((void *)uap++, (long)arg1);
 		(void)suword((void *)uap++, 0);	/* terminator */
 		/*
 		 * Now try to exec the program.  If can't for any reason
 		 * other than it doesn't exist, complain.
 		 */
 		error = sys_execve(l, &args, retval);
 		if (error == 0 || error == EJUSTRETURN) {
 			KERNEL_UNLOCK_LAST(l);
 			return;
+		}
 		printf("exec %s: error %d\n", path, error);
+	}
 	printf("init: not found\n");
 	panic("no init");
+}
 /*
  * calculate cache size from physmem and vm_map size.
  */
 vaddr_t
 calc_cache_size(struct vm_map *map, int pct, int va_pct)
+{
 	paddr_t t;
 	/* XXX should consider competing cache if any */
 	/* XXX should consider submaps */
 	t = (uintmax_t)physmem * pct / 100 * PAGE_SIZE;
 	if (map != NULL) {
 		vsize_t vsize;
 		vsize = vm_map_max(map) - vm_map_min(map);
 		vsize = (uintmax_t)vsize * va_pct / 100;
 		if (t > vsize) {
 			t = vsize;
+		}
+	}
 	return t;
+}

 @@ -1,1444 +1,1444 @@
-/* $NetBSD: subr_autoconf.c,v 1.163.4.1 2009/02/02 02:38:32 snj Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.163.4.2 2009/03/15 19:43:48 snj Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *          This product includes software developed for the
  *          NetBSD Project.  See http://www.NetBSD.org/ for
  *          information about NetBSD.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * --(license Id: LICENSE.proto,v 1.1 2000/06/13 21:40:26 cgd Exp )--
  */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp  (LBL)
+ *
  *	@(#)subr_autoconf.c	8.3 (Berkeley) 5/17/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.163.4.1 2009/02/02 02:38:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.163.4.2 2009/03/15 19:43:48 snj Exp $");
 #include "opt_ddb.h"
 #include "drvctl.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/kthread.h>
 #include <sys/buf.h>
 #include <sys/dirent.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/unistd.h>
 #include <sys/fcntl.h>
 #include <sys/lockf.h>
 #include <sys/callout.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/devmon.h>
 #include <sys/cpu.h>
 #include <sys/disk.h>
 #include <machine/limits.h>
 #include "opt_userconf.h"
 #ifdef USERCONF
 #include <sys/userconf.h>
 #endif
 #ifdef __i386__
 #include "opt_splash.h"
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 #include <dev/splash/splash.h>
 extern struct splash_progress *splash_progress_state;
 #endif
 #endif
 /*
  * Autoconfiguration subroutines.
  */
 typedef struct pmf_private {
 	int		pp_nwait;
 	int		pp_nlock;
 	lwp_t		*pp_holder;
 	kmutex_t	pp_mtx;
 	kcondvar_t	pp_cv;
 } pmf_private_t;
 /*
  * ioconf.c exports exactly two names: cfdata and cfroots.  All system
  * devices and drivers are found via these tables.
  */
 extern struct cfdata cfdata[];
 extern const short cfroots[];
 /*
  * List of all cfdriver structures.  We use this to detect duplicates
  * when other cfdrivers are loaded.
  */
 struct cfdriverlist allcfdrivers = LIST_HEAD_INITIALIZER(&allcfdrivers);
 extern struct cfdriver * const cfdriver_list_initial[];
 /*
  * Initial list of cfattach's.
  */
 extern const struct cfattachinit cfattachinit[];
 /*
  * List of cfdata tables.  We always have one such list -- the one
  * built statically when the kernel was configured.
  */
 struct cftablelist allcftables = TAILQ_HEAD_INITIALIZER(allcftables);
 static struct cftable initcftable;
 #define	ROOT ((device_t)NULL)
 struct matchinfo {
 	cfsubmatch_t fn;
 	struct	device *parent;
 	const int *locs;
 	void	*aux;
 	struct	cfdata *match;
 	int	pri;
 };
 static char *number(char *, int);
 static void mapply(struct matchinfo *, cfdata_t);
 static device_t config_devalloc(const device_t, const cfdata_t, const int *);
 static void config_devdealloc(device_t);
 static void config_makeroom(int, struct cfdriver *);
 static void config_devlink(device_t);
 static void config_devunlink(device_t);
 static void pmflock_debug(device_t, const char *, int);
 static void pmflock_debug_with_flags(device_t, const char *, int PMF_FN_PROTO);
 static device_t deviter_next1(deviter_t *);
 static void deviter_reinit(deviter_t *);
 struct deferred_config {
 	TAILQ_ENTRY(deferred_config) dc_queue;
 	device_t dc_dev;
 	void (*dc_func)(device_t);
 };
 TAILQ_HEAD(deferred_config_head, deferred_config);
 struct deferred_config_head deferred_config_queue =
 	TAILQ_HEAD_INITIALIZER(deferred_config_queue);
 struct deferred_config_head interrupt_config_queue =
 	TAILQ_HEAD_INITIALIZER(interrupt_config_queue);
 int interrupt_config_threads = 8;
 static void config_process_deferred(struct deferred_config_head *, device_t);
 /* Hooks to finalize configuration once all real devices have been found. */
 struct finalize_hook {
 	TAILQ_ENTRY(finalize_hook) f_list;
 	int (*f_func)(device_t);
 	device_t f_dev;
 };
 static TAILQ_HEAD(, finalize_hook) config_finalize_list =
 	TAILQ_HEAD_INITIALIZER(config_finalize_list);
 static int config_finalize_done;
 /* list of all devices */
 struct devicelist alldevs = TAILQ_HEAD_INITIALIZER(alldevs);
 kcondvar_t alldevs_cv;
 kmutex_t alldevs_mtx;
 static int alldevs_nread = 0;
 static int alldevs_nwrite = 0;
 static lwp_t *alldevs_writer = NULL;
 static int config_pending;		/* semaphore for mountroot */
 static kmutex_t config_misc_lock;
 static kcondvar_t config_misc_cv;
 #define	STREQ(s1, s2)			\
 	(*(s1) == *(s2) && strcmp((s1), (s2)) == 0)
 static int config_initialized;		/* config_init() has been called. */
 static int config_do_twiddle;
 struct vnode *
 opendisk(struct device *dv)
+{
 	int bmajor, bminor;
 	struct vnode *tmpvn;
 	int error;
 	dev_t dev;
 	/*
 	 * Lookup major number for disk block device.
 	 */
 	bmajor = devsw_name2blk(device_xname(dv), NULL, 0);
 	if (bmajor == -1)
 		return NULL;
 	bminor = minor(device_unit(dv));
 	/*
 	 * Fake a temporary vnode for the disk, open it, and read
 	 * and hash the sectors.
 	 */
 	dev = device_is_a(dv, "dk") ? makedev(bmajor, bminor) :
 	    MAKEDISKDEV(bmajor, bminor, RAW_PART);
 	if (bdevvp(dev, &tmpvn))
 		panic("%s: can't alloc vnode for %s", __func__,
 		    device_xname(dv));
 	error = VOP_OPEN(tmpvn, FREAD, NOCRED);
 	if (error) {
 #ifndef DEBUG
 		/*
 		 * Ignore errors caused by missing device, partition,
 		 * or medium.
 		 */
 		if (error != ENXIO && error != ENODEV)
 #endif
 			printf("%s: can't open dev %s (%d)\n",
 			    __func__, device_xname(dv), error);
 		vput(tmpvn);
 		return NULL;
+	}
 	return tmpvn;
+}
 int
 config_handle_wedges(struct device *dv, int par)
+{
 	struct dkwedge_list wl;
 	struct dkwedge_info *wi;
 	struct vnode *vn;
 	char diskname[16];
 	int i, error;
 	if ((vn = opendisk(dv)) == NULL)
 		return -1;
 	wl.dkwl_bufsize = sizeof(*wi) * 16;
 	wl.dkwl_buf = wi = malloc(wl.dkwl_bufsize, M_TEMP, M_WAITOK);
 	error = VOP_IOCTL(vn, DIOCLWEDGES, &wl, FREAD, NOCRED);
 	VOP_CLOSE(vn, FREAD, NOCRED);
 	vput(vn);
 	if (error) {
 #ifdef DEBUG_WEDGE
 		printf("%s: List wedges returned %d\n",
 		    device_xname(dv), error);
 #endif
 		free(wi, M_TEMP);
 		return -1;
+	}
 #ifdef DEBUG_WEDGE
 	printf("%s: Returned %u(%u) wedges\n", device_xname(dv),
 	    wl.dkwl_nwedges, wl.dkwl_ncopied);
 #endif
 	snprintf(diskname, sizeof(diskname), "%s%c", device_xname(dv),
 	    par + 'a');
 	for (i = 0; i < wl.dkwl_ncopied; i++) {
 #ifdef DEBUG_WEDGE
 		printf("%s: Looking for %s in %s\n",
 		    device_xname(dv), diskname, wi[i].dkw_wname);
 #endif
 		if (strcmp(wi[i].dkw_wname, diskname) == 0)
 			break;
+	}
 	if (i == wl.dkwl_ncopied) {
 #ifdef DEBUG_WEDGE
 		printf("%s: Cannot find wedge with parent %s\n",
 		    device_xname(dv), diskname);
 #endif
 		free(wi, M_TEMP);
 		return -1;
+	}
 #ifdef DEBUG_WEDGE
 	printf("%s: Setting boot wedge %s (%s) at %llu %llu\n",
 		device_xname(dv), wi[i].dkw_devname, wi[i].dkw_wname,
 		(unsigned long long)wi[i].dkw_offset,
 		(unsigned long long)wi[i].dkw_size);
 #endif
 	dkwedge_set_bootwedge(dv, wi[i].dkw_offset, wi[i].dkw_size);
 	free(wi, M_TEMP);
 	return 0;
+}
 /*
  * Initialize the autoconfiguration data structures.  Normally this
  * is done by configure(), but some platforms need to do this very
  * early (to e.g. initialize the console).
  */
 void
 config_init(void)
+{
 	const struct cfattachinit *cfai;
 	int i, j;
 	if (config_initialized)
 		return;
 	mutex_init(&alldevs_mtx, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&alldevs_cv, "alldevs");
 	mutex_init(&config_misc_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&config_misc_cv, "cfgmisc");
 	/* allcfdrivers is statically initialized. */
 	for (i = 0; cfdriver_list_initial[i] != NULL; i++) {
 		if (config_cfdriver_attach(cfdriver_list_initial[i]) != 0)
 			panic("configure: duplicate `%s' drivers",
 			    cfdriver_list_initial[i]->cd_name);
+	}
 	for (cfai = &cfattachinit[0]; cfai->cfai_name != NULL; cfai++) {
 		for (j = 0; cfai->cfai_list[j] != NULL; j++) {
 			if (config_cfattach_attach(cfai->cfai_name,
 						   cfai->cfai_list[j]) != 0)
 				panic("configure: duplicate `%s' attachment "
 				    "of `%s' driver",
 				    cfai->cfai_list[j]->ca_name,
 				    cfai->cfai_name);
+		}
+	}
 	initcftable.ct_cfdata = cfdata;
 	TAILQ_INSERT_TAIL(&allcftables, &initcftable, ct_list);
 	config_initialized = 1;
+}
 void
 config_deferred(device_t dev)
+{
 	config_process_deferred(&deferred_config_queue, dev);
 	config_process_deferred(&interrupt_config_queue, dev);
+}
 static void
 config_interrupts_thread(void *cookie)
+{
 	struct deferred_config *dc;
 	while ((dc = TAILQ_FIRST(&interrupt_config_queue)) != NULL) {
 		TAILQ_REMOVE(&interrupt_config_queue, dc, dc_queue);
 		(*dc->dc_func)(dc->dc_dev);
 		kmem_free(dc, sizeof(*dc));
 		config_pending_decr();
+	}
 	kthread_exit(0);
+}
 /*
  * Configure the system's hardware.
  */
 void
 configure(void)
+{
 	extern void ssp_init(void);
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	int i, s;
 	/* Initialize data structures. */
 	config_init();
 	pmf_init();
 #if NDRVCTL > 0
 	drvctl_init();
 #endif
 #ifdef USERCONF
 	if (boothowto & RB_USERCONF)
 		user_config();
 #endif
 	if ((boothowto & (AB_SILENT|AB_VERBOSE)) == AB_SILENT) {
 		config_do_twiddle = 1;
 		printf_nolog("Detecting hardware...");
+	}
 	/*
 	 * Do the machine-dependent portion of autoconfiguration.  This
 	 * sets the configuration machinery here in motion by "finding"
 	 * the root bus.  When this function returns, we expect interrupts
 	 * to be enabled.
 	 */
 	cpu_configure();
+}
-	/* Initialize SSP. */
+void
-	ssp_init();
+configure2(void)
+{
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	int i, s;
 	/*
 	 * Now that we've found all the hardware, start the real time
 	 * and statistics clocks.
 	 */
 	initclocks();
 	cold = 0;	/* clocks are running, we're warm now! */
 	s = splsched();
 	curcpu()->ci_schedstate.spc_flags |= SPCF_RUNNING;
 	splx(s);
 	/* Boot the secondary processors. */
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		uvm_cpu_attach(ci);
+	}
 	mp_online = true;
 #if defined(MULTIPROCESSOR)
 	cpu_boot_secondary_processors();
 #endif
 	/* Setup the runqueues and scheduler. */
 	runq_init();
 	sched_init();
 	/*
 	 * Create threads to call back and finish configuration for
 	 * devices that want interrupts enabled.
 	 */
 	for (i = 0; i < interrupt_config_threads; i++) {
 		(void)kthread_create(PRI_NONE, 0, NULL,
 		    config_interrupts_thread, NULL, NULL, "config");
+	}
 	/* Get the threads going and into any sleeps before continuing. */
 	yield();
+}
 /*
  * Announce device attach/detach to userland listeners.
  */
 static void
 devmon_report_device(device_t dev, bool isattach)
+{
 #if NDRVCTL > 0
 	prop_dictionary_t ev;
 	const char *parent;
 	const char *what;
 	device_t pdev = device_parent(dev);
 	ev = prop_dictionary_create();
 	if (ev == NULL)
 		return;
 	what = (isattach ? "device-attach" : "device-detach");
 	parent = (pdev == NULL ? "root" : device_xname(pdev));
 	if (!prop_dictionary_set_cstring(ev, "device", device_xname(dev)) ||
 	    !prop_dictionary_set_cstring(ev, "parent", parent)) {
 		prop_object_release(ev);
 		return;
+	}
 	devmon_insert(what, ev);
 #endif
+}
 /*
  * Add a cfdriver to the system.
  */
 int
 config_cfdriver_attach(struct cfdriver *cd)
+{
 	struct cfdriver *lcd;
 	/* Make sure this driver isn't already in the system. */
 	LIST_FOREACH(lcd, &allcfdrivers, cd_list) {
 		if (STREQ(lcd->cd_name, cd->cd_name))
 			return (EEXIST);
+	}
 	LIST_INIT(&cd->cd_attach);
 	LIST_INSERT_HEAD(&allcfdrivers, cd, cd_list);
 	return (0);
+}
 /*
  * Remove a cfdriver from the system.
  */
 int
 config_cfdriver_detach(struct cfdriver *cd)
+{
 	int i;
 	/* Make sure there are no active instances. */
 	for (i = 0; i < cd->cd_ndevs; i++) {
 		if (cd->cd_devs[i] != NULL)
 			return (EBUSY);
+	}
 	/* ...and no attachments loaded. */
 	if (LIST_EMPTY(&cd->cd_attach) == 0)
 		return (EBUSY);
 	LIST_REMOVE(cd, cd_list);
 	KASSERT(cd->cd_devs == NULL);
 	return (0);
+}
 /*
  * Look up a cfdriver by name.
  */
 struct cfdriver *
 config_cfdriver_lookup(const char *name)
+{
 	struct cfdriver *cd;
 	LIST_FOREACH(cd, &allcfdrivers, cd_list) {
 		if (STREQ(cd->cd_name, name))
 			return (cd);
+	}
 	return (NULL);
+}
 /*
  * Add a cfattach to the specified driver.
  */
 int
 config_cfattach_attach(const char *driver, struct cfattach *ca)
+{
 	struct cfattach *lca;
 	struct cfdriver *cd;
 	cd = config_cfdriver_lookup(driver);
 	if (cd == NULL)
 		return (ESRCH);
 	/* Make sure this attachment isn't already on this driver. */
 	LIST_FOREACH(lca, &cd->cd_attach, ca_list) {
 		if (STREQ(lca->ca_name, ca->ca_name))
 			return (EEXIST);
+	}
 	LIST_INSERT_HEAD(&cd->cd_attach, ca, ca_list);
 	return (0);
+}
 /*
  * Remove a cfattach from the specified driver.
  */
 int
 config_cfattach_detach(const char *driver, struct cfattach *ca)
+{
 	struct cfdriver *cd;
 	device_t dev;
 	int i;
 	cd = config_cfdriver_lookup(driver);
 	if (cd == NULL)
 		return (ESRCH);
 	/* Make sure there are no active instances. */
 	for (i = 0; i < cd->cd_ndevs; i++) {
 		if ((dev = cd->cd_devs[i]) == NULL)
 			continue;
 		if (dev->dv_cfattach == ca)
 			return (EBUSY);
+	}
 	LIST_REMOVE(ca, ca_list);
 	return (0);
+}
 /*
  * Look up a cfattach by name.
  */
 static struct cfattach *
 config_cfattach_lookup_cd(struct cfdriver *cd, const char *atname)
+{
 	struct cfattach *ca;
 	LIST_FOREACH(ca, &cd->cd_attach, ca_list) {
 		if (STREQ(ca->ca_name, atname))
 			return (ca);
+	}
 	return (NULL);
+}
 /*
  * Look up a cfattach by driver/attachment name.
  */
 struct cfattach *
 config_cfattach_lookup(const char *name, const char *atname)
+{
 	struct cfdriver *cd;
 	cd = config_cfdriver_lookup(name);
 	if (cd == NULL)
 		return (NULL);
 	return (config_cfattach_lookup_cd(cd, atname));
+}
 /*
  * Apply the matching function and choose the best.  This is used
  * a few times and we want to keep the code small.
  */
 static void
 mapply(struct matchinfo *m, cfdata_t cf)
+{
 	int pri;
 	if (m->fn != NULL) {
 		pri = (*m->fn)(m->parent, cf, m->locs, m->aux);
 	} else {
 		pri = config_match(m->parent, cf, m->aux);
+	}
 	if (pri > m->pri) {
 		m->match = cf;
 		m->pri = pri;
+	}
+}
 int
 config_stdsubmatch(device_t parent, cfdata_t cf, const int *locs, void *aux)
+{
 	const struct cfiattrdata *ci;
 	const struct cflocdesc *cl;
 	int nlocs, i;
 	ci = cfiattr_lookup(cf->cf_pspec->cfp_iattr, parent->dv_cfdriver);
 	KASSERT(ci);
 	nlocs = ci->ci_loclen;
 	KASSERT(!nlocs || locs);
 	for (i = 0; i < nlocs; i++) {
 		cl = &ci->ci_locdesc[i];
 		/* !cld_defaultstr means no default value */
 		if ((!(cl->cld_defaultstr)
 		     || (cf->cf_loc[i] != cl->cld_default))
 		    && cf->cf_loc[i] != locs[i])
 			return (0);
+	}
 	return (config_match(parent, cf, aux));
+}
 /*
  * Helper function: check whether the driver supports the interface attribute
  * and return its descriptor structure.
  */
 static const struct cfiattrdata *
 cfdriver_get_iattr(const struct cfdriver *cd, const char *ia)
+{
 	const struct cfiattrdata * const *cpp;
 	if (cd->cd_attrs == NULL)
 		return (0);
 	for (cpp = cd->cd_attrs; *cpp; cpp++) {
 		if (STREQ((*cpp)->ci_name, ia)) {
 			/* Match. */
 			return (*cpp);
+		}
+	}
 	return (0);
+}
 /*
  * Lookup an interface attribute description by name.
  * If the driver is given, consider only its supported attributes.
  */
 const struct cfiattrdata *
 cfiattr_lookup(const char *name, const struct cfdriver *cd)
+{
 	const struct cfdriver *d;
 	const struct cfiattrdata *ia;
 	if (cd)
 		return (cfdriver_get_iattr(cd, name));
 	LIST_FOREACH(d, &allcfdrivers, cd_list) {
 		ia = cfdriver_get_iattr(d, name);
 		if (ia)
 			return (ia);
+	}
 	return (0);
+}
 /*
  * Determine if `parent' is a potential parent for a device spec based
  * on `cfp'.
  */
 static int
 cfparent_match(const device_t parent, const struct cfparent *cfp)
+{
 	struct cfdriver *pcd;
 	/* We don't match root nodes here. */
 	if (cfp == NULL)
 		return (0);
 	pcd = parent->dv_cfdriver;
 	KASSERT(pcd != NULL);
 	/*
 	 * First, ensure this parent has the correct interface
 	 * attribute.
 	 */
 	if (!cfdriver_get_iattr(pcd, cfp->cfp_iattr))
 		return (0);
 	/*
 	 * If no specific parent device instance was specified (i.e.
 	 * we're attaching to the attribute only), we're done!
 	 */
 	if (cfp->cfp_parent == NULL)
 		return (1);
 	/*
 	 * Check the parent device's name.
 	 */
 	if (STREQ(pcd->cd_name, cfp->cfp_parent) == 0)
 		return (0);	/* not the same parent */
 	/*
 	 * Make sure the unit number matches.
 	 */
 	if (cfp->cfp_unit == DVUNIT_ANY ||	/* wildcard */
 	    cfp->cfp_unit == parent->dv_unit)
 		return (1);
 	/* Unit numbers don't match. */
 	return (0);
+}
 /*
  * Helper for config_cfdata_attach(): check all devices whether it could be
  * parent any attachment in the config data table passed, and rescan.
  */
 static void
 rescan_with_cfdata(const struct cfdata *cf)
+{
 	device_t d;
 	const struct cfdata *cf1;
 	deviter_t di;
 	/*
 	 * "alldevs" is likely longer than an LKM's cfdata, so make it
 	 * the outer loop.
 	 */
 	for (d = deviter_first(&di, 0); d != NULL; d = deviter_next(&di)) {
 		if (!(d->dv_cfattach->ca_rescan))
 			continue;
 		for (cf1 = cf; cf1->cf_name; cf1++) {
 			if (!cfparent_match(d, cf1->cf_pspec))
 				continue;
 			(*d->dv_cfattach->ca_rescan)(d,
 				cf1->cf_pspec->cfp_iattr, cf1->cf_loc);
+		}
+	}
 	deviter_release(&di);
+}
 /*
  * Attach a supplemental config data table and rescan potential
  * parent devices if required.
  */
 int
 config_cfdata_attach(cfdata_t cf, int scannow)
+{
 	struct cftable *ct;
 	ct = kmem_alloc(sizeof(*ct), KM_SLEEP);
 	ct->ct_cfdata = cf;
 	TAILQ_INSERT_TAIL(&allcftables, ct, ct_list);
 	if (scannow)
 		rescan_with_cfdata(cf);
 	return (0);
+}
 /*
  * Helper for config_cfdata_detach: check whether a device is
  * found through any attachment in the config data table.
  */
 static int
 dev_in_cfdata(const struct device *d, const struct cfdata *cf)
+{
 	const struct cfdata *cf1;
 	for (cf1 = cf; cf1->cf_name; cf1++)
 		if (d->dv_cfdata == cf1)
 			return (1);
 	return (0);
+}
 /*
  * Detach a supplemental config data table. Detach all devices found
  * through that table (and thus keeping references to it) before.
  */
 int
 config_cfdata_detach(cfdata_t cf)
+{
 	device_t d;
 	int error = 0;
 	struct cftable *ct;
 	deviter_t di;
 	for (d = deviter_first(&di, DEVITER_F_RW); d != NULL;
 	     d = deviter_next(&di)) {
 		if (!dev_in_cfdata(d, cf))
 			continue;
 		if ((error = config_detach(d, 0)) != 0)
 			break;
+	}
 	deviter_release(&di);
 	if (error) {
 		aprint_error_dev(d, "unable to detach instance\n");
 		return error;
+	}
 	TAILQ_FOREACH(ct, &allcftables, ct_list) {
 		if (ct->ct_cfdata == cf) {
 			TAILQ_REMOVE(&allcftables, ct, ct_list);
 			kmem_free(ct, sizeof(*ct));
 			return (0);
+		}
+	}
 	/* not found -- shouldn't happen */
 	return (EINVAL);
+}
 /*
  * Invoke the "match" routine for a cfdata entry on behalf of
  * an external caller, usually a "submatch" routine.
  */
 int
 config_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct cfattach *ca;
 	ca = config_cfattach_lookup(cf->cf_name, cf->cf_atname);
 	if (ca == NULL) {
 		/* No attachment for this entry, oh well. */
 		return (0);
+	}
 	return ((*ca->ca_match)(parent, cf, aux));
+}
 /*
  * Iterate over all potential children of some device, calling the given
  * function (default being the child's match function) for each one.
  * Nonzero returns are matches; the highest value returned is considered
  * the best match.  Return the `found child' if we got a match, or NULL
  * otherwise.  The `aux' pointer is simply passed on through.
+ *
  * Note that this function is designed so that it can be used to apply
  * an arbitrary function to all potential children (its return value
  * can be ignored).
  */
 cfdata_t
 config_search_loc(cfsubmatch_t fn, device_t parent,
 		  const char *ifattr, const int *locs, void *aux)
+{
 	struct cftable *ct;
 	cfdata_t cf;
 	struct matchinfo m;
 	KASSERT(config_initialized);
 	KASSERT(!ifattr || cfdriver_get_iattr(parent->dv_cfdriver, ifattr));
 	m.fn = fn;
 	m.parent = parent;
 	m.locs = locs;
 	m.aux = aux;
 	m.match = NULL;
 	m.pri = 0;
 	TAILQ_FOREACH(ct, &allcftables, ct_list) {
 		for (cf = ct->ct_cfdata; cf->cf_name; cf++) {
 			/* We don't match root nodes here. */
 			if (!cf->cf_pspec)
 				continue;
 			/*
 			 * Skip cf if no longer eligible, otherwise scan
 			 * through parents for one matching `parent', and
 			 * try match function.
 			 */
 			if (cf->cf_fstate == FSTATE_FOUND)
 				continue;
 			if (cf->cf_fstate == FSTATE_DNOTFOUND ||
 			    cf->cf_fstate == FSTATE_DSTAR)
 				continue;
 			/*
 			 * If an interface attribute was specified,
 			 * consider only children which attach to
 			 * that attribute.
 			 */
 			if (ifattr && !STREQ(ifattr, cf->cf_pspec->cfp_iattr))
 				continue;
 			if (cfparent_match(parent, cf->cf_pspec))
 				mapply(&m, cf);
+		}
+	}
 	return (m.match);
+}
 cfdata_t
 config_search_ia(cfsubmatch_t fn, device_t parent, const char *ifattr,
     void *aux)
+{
 	return (config_search_loc(fn, parent, ifattr, NULL, aux));
+}
 /*
  * Find the given root device.
  * This is much like config_search, but there is no parent.
  * Don't bother with multiple cfdata tables; the root node
  * must always be in the initial table.
  */
 cfdata_t
 config_rootsearch(cfsubmatch_t fn, const char *rootname, void *aux)
+{
 	cfdata_t cf;
 	const short *p;
 	struct matchinfo m;
 	m.fn = fn;
 	m.parent = ROOT;
 	m.aux = aux;
 	m.match = NULL;
 	m.pri = 0;
 	m.locs = 0;
 	/*
 	 * Look at root entries for matching name.  We do not bother
 	 * with found-state here since only one root should ever be
 	 * searched (and it must be done first).
 	 */
 	for (p = cfroots; *p >= 0; p++) {
 		cf = &cfdata[*p];
 		if (strcmp(cf->cf_name, rootname) == 0)
 			mapply(&m, cf);
+	}
 	return (m.match);
+}
 static const char * const msgs[3] = { "", " not configured\n", " unsupported\n" };
 /*
  * The given `aux' argument describes a device that has been found
  * on the given parent, but not necessarily configured.  Locate the
  * configuration data for that device (using the submatch function
  * provided, or using candidates' cd_match configuration driver
  * functions) and attach it, and return true.  If the device was
  * not configured, call the given `print' function and return 0.
  */
 device_t
 config_found_sm_loc(device_t parent,
 		const char *ifattr, const int *locs, void *aux,
 		cfprint_t print, cfsubmatch_t submatch)
+{
 	cfdata_t cf;
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	if ((cf = config_search_loc(submatch, parent, ifattr, locs, aux)))
 		return(config_attach_loc(parent, cf, locs, aux, print));
 	if (print) {
 		if (config_do_twiddle)
 			twiddle();
 		aprint_normal("%s", msgs[(*print)(aux, device_xname(parent))]);
+	}
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	return (NULL);
+}
 device_t
 config_found_ia(device_t parent, const char *ifattr, void *aux,
     cfprint_t print)
+{
 	return (config_found_sm_loc(parent, ifattr, NULL, aux, print, NULL));
+}
 device_t
 config_found(device_t parent, void *aux, cfprint_t print)
+{
 	return (config_found_sm_loc(parent, NULL, NULL, aux, print, NULL));
+}
 /*
  * As above, but for root devices.
  */
 device_t
 config_rootfound(const char *rootname, void *aux)
+{
 	cfdata_t cf;
 	if ((cf = config_rootsearch((cfsubmatch_t)NULL, rootname, aux)) != NULL)
 		return (config_attach(ROOT, cf, aux, (cfprint_t)NULL));
 	aprint_error("root device %s not configured\n", rootname);
 	return (NULL);
+}
 /* just like sprintf(buf, "%d") except that it works from the end */
 static char *
 number(char *ep, int n)
+{
 	*--ep = 0;
 	while (n >= 10) {
 		*--ep = (n % 10) + '0';
 		n /= 10;
+	}
 	*--ep = n + '0';
 	return (ep);
+}
 /*
  * Expand the size of the cd_devs array if necessary.
  */
 static void
 config_makeroom(int n, struct cfdriver *cd)
+{
 	const km_flag_t kmflags = (cold ? KM_NOSLEEP : KM_SLEEP);
 	int old, new;
 	device_t *nsp;
 	if (n < cd->cd_ndevs)
 		return;
 	/*
 	 * Need to expand the array.
 	 */
 	old = cd->cd_ndevs;
 	if (old == 0)
 		new = 4;
 	else
 		new = old * 2;
 	while (new <= n)
 		new *= 2;
 	cd->cd_ndevs = new;
 	nsp = kmem_alloc(sizeof(device_t [new]), kmflags);
 	if (nsp == NULL)
 		panic("config_attach: %sing dev array",
 		    old != 0 ? "expand" : "creat");
 	memset(nsp + old, 0, sizeof(device_t [new - old]));
 	if (old != 0) {
 		memcpy(nsp, cd->cd_devs, sizeof(device_t [old]));
 		kmem_free(cd->cd_devs, sizeof(device_t [old]));
+	}
 	cd->cd_devs = nsp;
+}
 static void
 config_devlink(device_t dev)
+{
 	struct cfdriver *cd = dev->dv_cfdriver;
 	/* put this device in the devices array */
 	config_makeroom(dev->dv_unit, cd);
 	if (cd->cd_devs[dev->dv_unit])
 		panic("config_attach: duplicate %s", device_xname(dev));
 	cd->cd_devs[dev->dv_unit] = dev;
 	/* It is safe to add a device to the tail of the list while
 	 * readers are in the list, but not while a writer is in
 	 * the list.  Wait for any writer to complete.
 	 */
 	mutex_enter(&alldevs_mtx);
 	while (alldevs_nwrite != 0 && alldevs_writer != curlwp)
 		cv_wait(&alldevs_cv, &alldevs_mtx);
 	TAILQ_INSERT_TAIL(&alldevs, dev, dv_list);	/* link up */
 	cv_signal(&alldevs_cv);
 	mutex_exit(&alldevs_mtx);
+}
 static void
 config_devunlink(device_t dev)
+{
 	struct cfdriver *cd = dev->dv_cfdriver;
 	int i;
 	/* Unlink from device list. */
 	TAILQ_REMOVE(&alldevs, dev, dv_list);
 	/* Remove from cfdriver's array. */
 	cd->cd_devs[dev->dv_unit] = NULL;
 	/*
 	 * If the device now has no units in use, deallocate its softc array.
 	 */
 	for (i = 0; i < cd->cd_ndevs; i++) {
 		if (cd->cd_devs[i] != NULL)
 			return;
+	}
 	/* nothing found; deallocate */
 	kmem_free(cd->cd_devs, sizeof(device_t [cd->cd_ndevs]));
 	cd->cd_devs = NULL;
 	cd->cd_ndevs = 0;
+}
 static device_t
 config_devalloc(const device_t parent, const cfdata_t cf, const int *locs)
+{
 	struct cfdriver *cd;
 	struct cfattach *ca;
 	size_t lname, lunit;
 	const char *xunit;
 	int myunit;
 	char num[10];
 	device_t dev;
 	void *dev_private;
 	const struct cfiattrdata *ia;
 	const km_flag_t kmflags = (cold ? KM_NOSLEEP : KM_SLEEP);
 	cd = config_cfdriver_lookup(cf->cf_name);
 	if (cd == NULL)
 		return (NULL);
 	ca = config_cfattach_lookup_cd(cd, cf->cf_atname);
 	if (ca == NULL)
 		return (NULL);
 	if ((ca->ca_flags & DVF_PRIV_ALLOC) == 0 &&
 	    ca->ca_devsize < sizeof(struct device))
 		panic("config_devalloc: %s", cf->cf_atname);
 #ifndef __BROKEN_CONFIG_UNIT_USAGE
 	if (cf->cf_fstate == FSTATE_STAR) {
 		for (myunit = cf->cf_unit; myunit < cd->cd_ndevs; myunit++)
 			if (cd->cd_devs[myunit] == NULL)
 				break;
 		/*
 		 * myunit is now the unit of the first NULL device pointer,
 		 * or max(cd->cd_ndevs,cf->cf_unit).
 		 */
 	} else {
 		myunit = cf->cf_unit;
 		if (myunit < cd->cd_ndevs && cd->cd_devs[myunit] != NULL)
 			return (NULL);
+	}
 #else
 	myunit = cf->cf_unit;
 #endif /* ! __BROKEN_CONFIG_UNIT_USAGE */
 	/* compute length of name and decimal expansion of unit number */
 	lname = strlen(cd->cd_name);
 	xunit = number(&num[sizeof(num)], myunit);
 	lunit = &num[sizeof(num)] - xunit;
 	if (lname + lunit > sizeof(dev->dv_xname))
 		panic("config_devalloc: device name too long");
 	/* get memory for all device vars */
 	KASSERT((ca->ca_flags & DVF_PRIV_ALLOC) || ca->ca_devsize >= sizeof(struct device));
 	if (ca->ca_devsize > 0) {
 		dev_private = kmem_zalloc(ca->ca_devsize, kmflags);
 		if (dev_private == NULL)
 			panic("config_devalloc: memory allocation for device softc failed");
 	} else {
 		KASSERT(ca->ca_flags & DVF_PRIV_ALLOC);
 		dev_private = NULL;
+	}
 	if ((ca->ca_flags & DVF_PRIV_ALLOC) != 0) {
 		dev = kmem_zalloc(sizeof(*dev), kmflags);
 	} else {
 		dev = dev_private;
+	}
 	if (dev == NULL)
 		panic("config_devalloc: memory allocation for device_t failed");
 	dev->dv_class = cd->cd_class;
 	dev->dv_cfdata = cf;
 	dev->dv_cfdriver = cd;
 	dev->dv_cfattach = ca;
 	dev->dv_unit = myunit;
 	dev->dv_activity_count = 0;
 	dev->dv_activity_handlers = NULL;
 	dev->dv_private = dev_private;
 	memcpy(dev->dv_xname, cd->cd_name, lname);
 	memcpy(dev->dv_xname + lname, xunit, lunit);
 	dev->dv_parent = parent;
 	if (parent != NULL)
 		dev->dv_depth = parent->dv_depth + 1;
 	else
 		dev->dv_depth = 0;
 	dev->dv_flags = DVF_ACTIVE;	/* always initially active */
 	dev->dv_flags |= ca->ca_flags;	/* inherit flags from class */
 	if (locs) {
 		KASSERT(parent); /* no locators at root */
 		ia = cfiattr_lookup(cf->cf_pspec->cfp_iattr,
 				    parent->dv_cfdriver);
 		dev->dv_locators =
 		    kmem_alloc(sizeof(int [ia->ci_loclen + 1]), kmflags);
 		*dev->dv_locators++ = sizeof(int [ia->ci_loclen + 1]);
 		memcpy(dev->dv_locators, locs, sizeof(int [ia->ci_loclen]));
+	}
 	dev->dv_properties = prop_dictionary_create();
 	KASSERT(dev->dv_properties != NULL);
 	prop_dictionary_set_cstring_nocopy(dev->dv_properties,
 	    "device-driver", dev->dv_cfdriver->cd_name);
 	prop_dictionary_set_uint16(dev->dv_properties,
 	    "device-unit", dev->dv_unit);
 	return (dev);
+}
 static void
 config_devdealloc(device_t dev)
+{
 	int priv = (dev->dv_flags & DVF_PRIV_ALLOC);
 	KASSERT(dev->dv_properties != NULL);
 	prop_object_release(dev->dv_properties);
 	if (dev->dv_activity_handlers)
 		panic("config_devdealloc with registered handlers");
 	if (dev->dv_locators) {
 		size_t amount = *--dev->dv_locators;
 		kmem_free(dev->dv_locators, amount);
+	}
 	if (dev->dv_cfattach->ca_devsize > 0)
 		kmem_free(dev->dv_private, dev->dv_cfattach->ca_devsize);
 	if (priv)
 		kmem_free(dev, sizeof(*dev));
+}
 /*
  * Attach a found device.
  */
 device_t
 config_attach_loc(device_t parent, cfdata_t cf,
 	const int *locs, void *aux, cfprint_t print)
+{
 	device_t dev;
 	struct cftable *ct;
 	const char *drvname;
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	dev = config_devalloc(parent, cf, locs);
 	if (!dev)
 		panic("config_attach: allocation of device softc failed");
 	/* XXX redundant - see below? */
 	if (cf->cf_fstate != FSTATE_STAR) {
 		KASSERT(cf->cf_fstate == FSTATE_NOTFOUND);
 		cf->cf_fstate = FSTATE_FOUND;
+	}
 #ifdef __BROKEN_CONFIG_UNIT_USAGE
 	  else
 		cf->cf_unit++;
 #endif
 	config_devlink(dev);
 	if (config_do_twiddle)
 		twiddle();
 	else
 		aprint_naive("Found ");
 	/*
 	 * We want the next two printfs for normal, verbose, and quiet,
 	 * but not silent (in which case, we're twiddling, instead).
 	 */
 	if (parent == ROOT) {
 		aprint_naive("%s (root)", device_xname(dev));
 		aprint_normal("%s (root)", device_xname(dev));
 	} else {
 		aprint_naive("%s at %s", device_xname(dev), device_xname(parent));
 		aprint_normal("%s at %s", device_xname(dev), device_xname(parent));
 		if (print)
 			(void) (*print)(aux, NULL);
+	}
 	/*
 	 * Before attaching, clobber any unfound devices that are
 	 * otherwise identical.
 	 * XXX code above is redundant?
 	 */
 	drvname = dev->dv_cfdriver->cd_name;
 	TAILQ_FOREACH(ct, &allcftables, ct_list) {
 		for (cf = ct->ct_cfdata; cf->cf_name; cf++) {
 			if (STREQ(cf->cf_name, drvname) &&
 			    cf->cf_unit == dev->dv_unit) {
 				if (cf->cf_fstate == FSTATE_NOTFOUND)
 					cf->cf_fstate = FSTATE_FOUND;
 #ifdef __BROKEN_CONFIG_UNIT_USAGE
 				/*
 				 * Bump the unit number on all starred cfdata
 				 * entries for this device.
 				 */
 				if (cf->cf_fstate == FSTATE_STAR)
 					cf->cf_unit++;
 #endif /* __BROKEN_CONFIG_UNIT_USAGE */
+			}
+		}
+	}
 #ifdef __HAVE_DEVICE_REGISTER
 	device_register(dev, aux);
 #endif
 	/* Let userland know */
 	devmon_report_device(dev, true);
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	(*dev->dv_cfattach->ca_attach)(parent, dev, aux);
 #if defined(SPLASHSCREEN) && defined(SPLASHSCREEN_PROGRESS)
 	if (splash_progress_state)
 		splash_progress_update(splash_progress_state);
 #endif
 	if (!device_pmf_is_registered(dev))
 		aprint_debug_dev(dev, "WARNING: power management not supported\n");
 	config_process_deferred(&deferred_config_queue, dev);
 	return (dev);
+}
 device_t
 config_attach(device_t parent, cfdata_t cf, void *aux, cfprint_t print)
+{
 	return (config_attach_loc(parent, cf, NULL, aux, print));
+}
 /*
  * As above, but for pseudo-devices.  Pseudo-devices attached in this
  * way are silently inserted into the device tree, and their children
  * attached.
+ *
  * Note that because pseudo-devices are attached silently, any information
  * the attach routine wishes to print should be prefixed with the device
  * name by the attach routine.
  */
 device_t
 config_attach_pseudo(cfdata_t cf)
+{
 	device_t dev;
 	dev = config_devalloc(ROOT, cf, NULL);
 	if (!dev)
 		return (NULL);
 	/* XXX mark busy in cfdata */
 	config_devlink(dev);
 #if 0	/* XXXJRT not yet */
 #ifdef __HAVE_DEVICE_REGISTER
 	device_register(dev, NULL);	/* like a root node */
 #endif
 #endif
 	(*dev->dv_cfattach->ca_attach)(ROOT, dev, NULL);
 	config_process_deferred(&deferred_config_queue, dev);
 	return (dev);
+}
 /*
  * Detach a device.  Optionally forced (e.g. because of hardware
  * removal) and quiet.  Returns zero if successful, non-zero

 @@ -1,526 +1,527 @@
-/* $NetBSD: device.h,v 1.112 2008/06/11 15:56:11 drochner Exp $ */
+/* $NetBSD: device.h,v 1.112.6.1 2009/03/15 19:43:48 snj Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *          This product includes software developed for the
  *          NetBSD Project.  See http://www.NetBSD.org/ for
  *          information about NetBSD.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * --(license Id: LICENSE.proto,v 1.1 2000/06/13 21:40:26 cgd Exp )--
  */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratories.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
  */
 #ifndef _SYS_DEVICE_H_
 #define	_SYS_DEVICE_H_
 #include <sys/evcnt.h>
 #include <sys/queue.h>
 typedef struct device *device_t;
 #ifdef _KERNEL
 #include <sys/pmf.h>
 #endif
 #include <prop/proplib.h>
 /*
  * Minimal device structures.
  * Note that all ``system'' device types are listed here.
  */
 typedef enum devclass {
 	DV_DULL,		/* generic, no special info */
 	DV_CPU,			/* CPU (carries resource utilization) */
 	DV_DISK,		/* disk drive (label, etc) */
 	DV_IFNET,		/* network interface */
 	DV_TAPE,		/* tape device */
 	DV_TTY,			/* serial line interface (?) */
 	DV_AUDIODEV,		/* audio device */
 	DV_DISPLAYDEV,		/* display device */
 	DV_BUS			/* bus device */
 } devclass_t;
 /*
  * Actions for ca_activate.
  */
 typedef enum devact {
 	DVACT_ACTIVATE,		/* activate the device */
 	DVACT_DEACTIVATE	/* deactivate the device */
 } devact_t;
 typedef enum {
 	DVA_SYSTEM,
 	DVA_HARDWARE
 } devactive_t;
 typedef struct cfdata *cfdata_t;
 typedef struct cfdriver *cfdriver_t;
 typedef struct cfattach *cfattach_t;
 struct device {
 	devclass_t	dv_class;	/* this device's classification */
 	TAILQ_ENTRY(device) dv_list;	/* entry on list of all devices */
 	cfdata_t	dv_cfdata;	/* config data that found us
 					   (NULL if pseudo-device) */
 	cfdriver_t	dv_cfdriver;	/* our cfdriver */
 	cfattach_t	dv_cfattach;	/* our cfattach */
 	int		dv_unit;	/* device unit number */
 	char		dv_xname[16];	/* external name (name + unit) */
 	device_t	dv_parent;	/* pointer to parent device
 					   (NULL if pseudo- or root node) */
 	int		dv_depth;	/* number of parents until root */
 	int		dv_flags;	/* misc. flags; see below */
 	void		*dv_private;	/* this device's private storage */
 	int		*dv_locators;	/* our actual locators (optional) */
 	prop_dictionary_t dv_properties;/* properties dictionary */
 	size_t		dv_activity_count;
 	void		(**dv_activity_handlers)(device_t, devactive_t);
 	bool		(*dv_driver_suspend)(device_t PMF_FN_PROTO);
 	bool		(*dv_driver_resume)(device_t PMF_FN_PROTO);
 	bool		(*dv_driver_shutdown)(device_t, int);
 	bool		(*dv_driver_child_register)(device_t);
 	void		*dv_bus_private;
 	bool		(*dv_bus_suspend)(device_t PMF_FN_PROTO);
 	bool		(*dv_bus_resume)(device_t PMF_FN_PROTO);
 	bool		(*dv_bus_shutdown)(device_t, int);
 	void		(*dv_bus_deregister)(device_t);
 	void		*dv_class_private;
 	bool		(*dv_class_suspend)(device_t PMF_FN_PROTO);
 	bool		(*dv_class_resume)(device_t PMF_FN_PROTO);
 	void		(*dv_class_deregister)(device_t);
 	void		*dv_pmf_private;
 };
 /* dv_flags */
 #define	DVF_ACTIVE		0x0001	/* device is activated */
 #define	DVF_PRIV_ALLOC		0x0002	/* device private storage != device */
 #define	DVF_POWER_HANDLERS	0x0004	/* device has suspend/resume support */
 #define	DVF_CLASS_SUSPENDED	0x0008	/* device class suspend was called */
 #define	DVF_DRIVER_SUSPENDED	0x0010	/* device driver suspend was called */
 #define	DVF_BUS_SUSPENDED	0x0020	/* device bus suspend was called */
 #define	DVF_SELF_SUSPENDED	0x0040	/* device suspended itself */
 TAILQ_HEAD(devicelist, device);
 enum deviter_flags {
 	  DEVITER_F_RW =		0x1
 	, DEVITER_F_SHUTDOWN =		0x2
 	, DEVITER_F_LEAVES_FIRST =	0x4
 	, DEVITER_F_ROOT_FIRST =	0x8
 };
 typedef enum deviter_flags deviter_flags_t;
 struct deviter {
 	device_t	di_prev;
 	deviter_flags_t	di_flags;
 	int		di_curdepth;
 	int		di_maxdepth;
 };
 typedef struct deviter deviter_t;
 /*
  * Description of a locator, as part of interface attribute definitions.
  */
 struct cflocdesc {
 	const char *cld_name;
 	const char *cld_defaultstr; /* NULL if no default */
 	int cld_default;
 };
 /*
  * Description of an interface attribute, provided by potential
  * parent device drivers, referred to by child device configuration data.
  */
 struct cfiattrdata {
 	const char *ci_name;
 	int ci_loclen;
 	const struct cflocdesc ci_locdesc[
 #if defined(__GNUC__) && __GNUC__ <= 2
 #endif
 	];
 };
 /*
  * Description of a configuration parent.  Each device attachment attaches
  * to an "interface attribute", which is given in this structure.  The parent
  * *must* carry this attribute.  Optionally, an individual device instance
  * may also specify a specific parent device instance.
  */
 struct cfparent {
 	const char *cfp_iattr;		/* interface attribute */
 	const char *cfp_parent;		/* optional specific parent */
 	int cfp_unit;			/* optional specific unit
 					   (-1 to wildcard) */
 };
 /*
  * Configuration data (i.e., data placed in ioconf.c).
  */
 struct cfdata {
 	const char *cf_name;		/* driver name */
 	const char *cf_atname;		/* attachment name */
 	short	cf_unit;		/* unit number */
 	short	cf_fstate;		/* finding state (below) */
 	int	*cf_loc;		/* locators (machine dependent) */
 	int	cf_flags;		/* flags from config */
 	const struct cfparent *cf_pspec;/* parent specification */
 };
 #define FSTATE_NOTFOUND		0	/* has not been found */
 #define	FSTATE_FOUND		1	/* has been found */
 #define	FSTATE_STAR		2	/* duplicable */
 #define FSTATE_DSTAR		3	/* has not been found, and disabled */
 #define FSTATE_DNOTFOUND	4	/* duplicate, and disabled */
 /*
  * Multiple configuration data tables may be maintained.  This structure
  * provides the linkage.
  */
 struct cftable {
 	cfdata_t	ct_cfdata;	/* pointer to cfdata table */
 	TAILQ_ENTRY(cftable) ct_list;	/* list linkage */
 };
 TAILQ_HEAD(cftablelist, cftable);
 typedef int (*cfsubmatch_t)(device_t, cfdata_t, const int *, void *);
 /*
  * `configuration' attachment and driver (what the machine-independent
  * autoconf uses).  As devices are found, they are applied against all
  * the potential matches.  The one with the best match is taken, and a
  * device structure (plus any other data desired) is allocated.  Pointers
  * to these are placed into an array of pointers.  The array itself must
  * be dynamic since devices can be found long after the machine is up
  * and running.
+ *
  * Devices can have multiple configuration attachments if they attach
  * to different attributes (busses, or whatever), to allow specification
  * of multiple match and attach functions.  There is only one configuration
  * driver per driver, so that things like unit numbers and the device
  * structure array will be shared.
  */
 struct cfattach {
 	const char *ca_name;		/* name of attachment */
 	LIST_ENTRY(cfattach) ca_list;	/* link on cfdriver's list */
 	size_t	  ca_devsize;		/* size of dev data (for malloc) */
 	int	  ca_flags;		/* flags for driver allocation etc */
 	int	(*ca_match)(device_t, cfdata_t, void *);
 	void	(*ca_attach)(device_t, device_t, void *);
 	int	(*ca_detach)(device_t, int);
 	int	(*ca_activate)(device_t, devact_t);
 	/* technically, the next 2 belong into "struct cfdriver" */
 	int	(*ca_rescan)(device_t, const char *,
 			     const int *); /* scan for new children */
 	void	(*ca_childdetached)(device_t, device_t);
 };
 LIST_HEAD(cfattachlist, cfattach);
 #define	CFATTACH_DECL2(name, ddsize, matfn, attfn, detfn, actfn, \
 	rescanfn, chdetfn) \
 struct cfattach __CONCAT(name,_ca) = {					\
 	.ca_name		= ___STRING(name),			\
 	.ca_devsize		= ddsize,				\
 	.ca_match 		= matfn,				\
 	.ca_attach		= attfn,				\
 	.ca_detach		= detfn,				\
 	.ca_activate		= actfn,				\
 	.ca_rescan		= rescanfn,				\
 	.ca_childdetached	= chdetfn,				\
+}
 #define	CFATTACH_DECL(name, ddsize, matfn, attfn, detfn, actfn)		\
 	CFATTACH_DECL2(name, ddsize, matfn, attfn, detfn, actfn, NULL, NULL)
 #define	CFATTACH_DECL2_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
 	rescanfn, chdetfn) \
 struct cfattach __CONCAT(name,_ca) = {					\
 	.ca_name		= ___STRING(name),			\
 	.ca_devsize		= ddsize,				\
 	.ca_flags		= DVF_PRIV_ALLOC,			\
 	.ca_match 		= matfn,				\
 	.ca_attach		= attfn,				\
 	.ca_detach		= detfn,				\
 	.ca_activate		= actfn,				\
 	.ca_rescan		= rescanfn,				\
 	.ca_childdetached	= chdetfn,				\
+}
 #define	CFATTACH_DECL_NEW(name, ddsize, matfn, attfn, detfn, actfn)		\
 	CFATTACH_DECL2_NEW(name, ddsize, matfn, attfn, detfn, actfn, NULL, NULL)
 /* Flags given to config_detach(), and the ca_detach function. */
 #define	DETACH_FORCE	0x01		/* force detachment; hardware gone */
 #define	DETACH_QUIET	0x02		/* don't print a notice */
 struct cfdriver {
 	LIST_ENTRY(cfdriver) cd_list;	/* link on allcfdrivers */
 	struct cfattachlist cd_attach;	/* list of all attachments */
 	device_t *cd_devs;		/* devices found */
 	const char *cd_name;		/* device name */
 	enum	devclass cd_class;	/* device classification */
 	int	cd_ndevs;		/* size of cd_devs array */
 	const struct cfiattrdata * const *cd_attrs; /* attributes provided */
 };
 LIST_HEAD(cfdriverlist, cfdriver);
 #define	CFDRIVER_DECL(name, class, attrs)				\
 struct cfdriver __CONCAT(name,_cd) = {					\
 	.cd_name		= ___STRING(name),			\
 	.cd_class		= class,				\
 	.cd_attrs		= attrs,				\
+}
 /*
  * The cfattachinit is a data structure used to associate a list of
  * cfattach's with cfdrivers as found in the static kernel configuration.
  */
 struct cfattachinit {
 	const char *cfai_name;		 /* driver name */
 	struct cfattach * const *cfai_list;/* list of attachments */
 };
 /*
  * the same, but with a non-constant list so it can be modified
  * for LKM bookkeeping
  */
 struct cfattachlkminit {
 	const char *cfai_name;		/* driver name */
 	struct cfattach **cfai_list;	/* list of attachments */
 };
 /*
  * Configuration printing functions, and their return codes.  The second
  * argument is NULL if the device was configured; otherwise it is the name
  * of the parent device.  The return value is ignored if the device was
  * configured, so most functions can return UNCONF unconditionally.
  */
 typedef int (*cfprint_t)(void *, const char *);		/* XXX const char * */
 #define	QUIET	0		/* print nothing */
 #define	UNCONF	1		/* print " not configured\n" */
 #define	UNSUPP	2		/* print " not supported\n" */
 /*
  * Pseudo-device attach information (function + number of pseudo-devs).
  */
 struct pdevinit {
 	void	(*pdev_attach)(int);
 	int	pdev_count;
 };
 /* This allows us to wildcard a device unit. */
 #define	DVUNIT_ANY	-1
 #ifdef _KERNEL
 extern struct cfdriverlist allcfdrivers;/* list of all cfdrivers */
 extern struct devicelist alldevs;	/* list of all devices */
 extern struct cftablelist allcftables;	/* list of all cfdata tables */
 extern device_t booted_device;		/* the device we booted from */
 extern device_t booted_wedge;		/* the wedge on that device */
 extern int booted_partition;		/* or the partition on that device */
 struct vnode *opendisk(struct device *);
 int config_handle_wedges(struct device *, int);
 void	config_init(void);
 void	drvctl_init(void);
 void	configure(void);
 void	configure2(void);
 int	config_cfdriver_attach(struct cfdriver *);
 int	config_cfdriver_detach(struct cfdriver *);
 int	config_cfattach_attach(const char *, struct cfattach *);
 int	config_cfattach_detach(const char *, struct cfattach *);
 int	config_cfdata_attach(cfdata_t, int);
 int	config_cfdata_detach(cfdata_t);
 struct cfdriver *config_cfdriver_lookup(const char *);
 struct cfattach *config_cfattach_lookup(const char *, const char *);
 const struct cfiattrdata *cfiattr_lookup(const char *, const struct cfdriver *);
 int	config_stdsubmatch(device_t, cfdata_t, const int *, void *);
 cfdata_t config_search_loc(cfsubmatch_t, device_t,
 				 const char *, const int *, void *);
 cfdata_t config_search_ia(cfsubmatch_t, device_t,
 				 const char *, void *);
 cfdata_t config_rootsearch(cfsubmatch_t, const char *, void *);
 device_t config_found_sm_loc(device_t, const char *, const int *,
 			     void *, cfprint_t, cfsubmatch_t);
 device_t config_found_ia(device_t, const char *, void *, cfprint_t);
 device_t config_found(device_t, void *, cfprint_t);
 device_t config_rootfound(const char *, void *);
 device_t config_attach_loc(device_t, cfdata_t, const int *, void *, cfprint_t);
 device_t config_attach(device_t, cfdata_t, void *, cfprint_t);
 int	config_match(device_t, cfdata_t, void *);
 device_t config_attach_pseudo(cfdata_t);
 int	config_detach(device_t, int);
 int	config_detach_children(device_t, int flags);
 int	config_activate(device_t);
 int	config_deactivate(device_t);
 void	config_defer(device_t, void (*)(device_t));
 void	config_deferred(device_t);
 void	config_interrupts(device_t, void (*)(device_t));
 void	config_pending_incr(void);
 void	config_pending_decr(void);
 int	config_finalize_register(device_t, int (*)(device_t));
 void	config_finalize(void);
 device_t	device_lookup(cfdriver_t, int);
 void		*device_lookup_private(cfdriver_t, int);
 #ifdef __HAVE_DEVICE_REGISTER
 void		device_register(device_t, void *);
 #endif
 devclass_t	device_class(device_t);
 cfdata_t	device_cfdata(device_t);
 cfdriver_t	device_cfdriver(device_t);
 cfattach_t	device_cfattach(device_t);
 int		device_unit(device_t);
 const char	*device_xname(device_t);
 device_t	device_parent(device_t);
 bool		device_is_active(device_t);
 bool		device_is_enabled(device_t);
 bool		device_has_power(device_t);
 int		device_locator(device_t, u_int);
 void		*device_private(device_t);
 prop_dictionary_t device_properties(device_t);
 device_t	deviter_first(deviter_t *, deviter_flags_t);
 void		deviter_init(deviter_t *, deviter_flags_t);
 device_t	deviter_next(deviter_t *);
 void		deviter_release(deviter_t *);
 bool		device_active(device_t, devactive_t);
 bool		device_active_register(device_t,
 				       void (*)(device_t, devactive_t));
 void		device_active_deregister(device_t,
 				         void (*)(device_t, devactive_t));
 bool		device_is_a(device_t, const char *);
 device_t	device_find_by_xname(const char *);
 device_t	device_find_by_driver_unit(const char *, int);
 bool		device_pmf_is_registered(device_t);
 bool		device_pmf_driver_suspend(device_t PMF_FN_PROTO);
 bool		device_pmf_driver_resume(device_t PMF_FN_PROTO);
 bool		device_pmf_driver_shutdown(device_t, int);
 bool		device_pmf_driver_register(device_t,
 		    bool (*)(device_t PMF_FN_PROTO),
 		    bool (*)(device_t PMF_FN_PROTO),
 		    bool (*)(device_t, int));
 void		device_pmf_driver_deregister(device_t);
 bool		device_pmf_driver_child_register(device_t);
 void		device_pmf_driver_set_child_register(device_t,
 		    bool (*)(device_t));
 void		*device_pmf_bus_private(device_t);
 bool		device_pmf_bus_suspend(device_t PMF_FN_PROTO);
 bool		device_pmf_bus_resume(device_t PMF_FN_PROTO);
 bool		device_pmf_bus_shutdown(device_t, int);
 void		*device_pmf_private(device_t);
 void		device_pmf_unlock(device_t PMF_FN_PROTO);
 bool		device_pmf_lock(device_t PMF_FN_PROTO);
 bool		device_is_self_suspended(device_t);
 void		device_pmf_self_suspend(device_t PMF_FN_PROTO);
 void		device_pmf_self_resume(device_t PMF_FN_PROTO);
 bool		device_pmf_self_wait(device_t PMF_FN_PROTO);
 void		device_pmf_bus_register(device_t, void *,
 		    bool (*)(device_t PMF_FN_PROTO),
 		    bool (*)(device_t PMF_FN_PROTO),
 		    bool (*)(device_t, int),
 		    void (*)(device_t));
 void		device_pmf_bus_deregister(device_t);
 void		*device_pmf_class_private(device_t);
 bool		device_pmf_class_suspend(device_t PMF_FN_PROTO);
 bool		device_pmf_class_resume(device_t PMF_FN_PROTO);
 void		device_pmf_class_register(device_t, void *,
 		    bool (*)(device_t PMF_FN_PROTO),
 		    bool (*)(device_t PMF_FN_PROTO),
 		    void (*)(device_t));
 void		device_pmf_class_deregister(device_t);
 #endif /* _KERNEL */
 #endif /* !_SYS_DEVICE_H_ */

 @@ -1,504 +1,506 @@
-/*	$NetBSD: systm.h,v 1.228.4.1 2009/02/26 20:38:00 snj Exp $	*/
+/*	$NetBSD: systm.h,v 1.228.4.2 2009/03/15 19:43:48 snj Exp $	*/
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
  */
 #ifndef _SYS_SYSTM_H_
 #define _SYS_SYSTM_H_
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #endif
 #include <machine/endian.h>
 #ifdef _KERNEL
 #include <sys/types.h>
 #endif
 struct clockframe;
 struct device;
 struct lwp;
 struct proc;
 struct timeval;
 struct tty;
 struct uio;
 struct vnode;
 struct vmspace;
 struct vm_map;
 extern const char *panicstr;	/* panic message */
 extern int doing_shutdown;	/* shutting down */
 extern const char copyright[];	/* system copyright */
 extern char cpu_model[];	/* machine/cpu model name */
 extern char machine[];		/* machine type */
 extern char machine_arch[];	/* machine architecture */
 extern const char osrelease[];	/* short system version */
 extern const char ostype[];	/* system type */
 extern const char kernel_ident[];/* kernel configuration ID */
 extern const char version[];	/* system version */
 extern int autonicetime;        /* time (in seconds) before autoniceval */
 extern int autoniceval;         /* proc priority after autonicetime */
 extern int selwait;		/* select timeout address */
 extern int maxmem;		/* max memory per process */
 extern int physmem;		/* physical memory */
 extern dev_t dumpdev;		/* dump device */
 extern dev_t dumpcdev;		/* dump device (character equivalent) */
 extern long dumplo;		/* offset into dumpdev */
 extern int dumpsize;		/* size of dump in pages */
 extern const char *dumpspec;	/* how dump device was specified */
 extern dev_t rootdev;		/* root device */
 extern struct vnode *rootvp;	/* vnode equivalent to above */
 extern struct device *root_device; /* device equivalent to above */
 extern const char *rootspec;	/* how root device was specified */
 extern int ncpu;		/* number of CPUs configured */
 extern int ncpuonline;		/* number of CPUs online */
 #if defined(_KERNEL)
 extern bool mp_online;		/* secondary processors are started */
 #endif /* defined(_KERNEL) */
 extern const char hexdigits[];	/* "0123456789abcdef" in subr_prf2.c */
 extern const char HEXDIGITS[];	/* "0123456789ABCDEF" in subr_prf2.c */
 /*
  * These represent the swap pseudo-device (`sw').  This device
  * is used by the swap pager to indirect through the routines
  * in sys/vm/vm_swap.c.
  */
 extern const dev_t swapdev;	/* swapping device */
 extern struct vnode *swapdev_vp;/* vnode equivalent to above */
 extern const dev_t zerodev;	/* /dev/zero */
 typedef int	sy_call_t(struct lwp *, const void *, register_t *);
 extern struct sysent {		/* system call table */
 	short	sy_narg;	/* number of args */
 	short	sy_argsize;	/* total size of arguments */
 	int	sy_flags;	/* flags. see below */
 	sy_call_t *sy_call;     /* implementing function */
 } sysent[];
 extern int nsysent;
 #if	BYTE_ORDER == BIG_ENDIAN
 #define	SCARG(p,k)	((p)->k.be.datum)	/* get arg from args pointer */
 #elif	BYTE_ORDER == LITTLE_ENDIAN
 #define	SCARG(p,k)	((p)->k.le.datum)	/* get arg from args pointer */
 #else
 #error	"what byte order is this machine?"
 #endif
 #define	SYCALL_INDIRECT	0x0002	/* indirect (ie syscall() or __syscall()) */
 extern int boothowto;		/* reboot flags, from console subsystem */
 #define	bootverbose	(boothowto & AB_VERBOSE)
 #define	bootquiet	(boothowto & AB_QUIET)
 extern void (*v_putc)(int); /* Virtual console putc routine */
 /*
  * General function declarations.
  */
 int	nullop(void *);
 int	enodev(void);
 int	enosys(void);
 int	enoioctl(void);
 int	enxio(void);
 int	eopnotsupp(void);
 enum hashtype {
 	HASH_LIST,
 	HASH_SLIST,
 	HASH_TAILQ
 };
 #ifdef _KERNEL
 void	*hashinit(u_int, enum hashtype, bool, u_long *);
 void	hashdone(void *, enum hashtype, u_long);
 int	seltrue(dev_t, int, struct lwp *);
 int	sys_nosys(struct lwp *, const void *, register_t *);
 void	aprint_normal(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_error(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_naive(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_verbose(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	aprint_debug(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 struct device;
 void	aprint_normal_dev(struct device *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_error_dev(struct device *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_naive_dev(struct device *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_verbose_dev(struct device *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_debug_dev(struct device *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 struct ifnet;
 void	aprint_normal_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_error_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_naive_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_verbose_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 void	aprint_debug_ifnet(struct ifnet *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 int	aprint_get_error_count(void);
 void	printf_tolog(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	printf_nolog(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	printf(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 int	sprintf(char *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 int	snprintf(char *, size_t, const char *, ...)
     __attribute__((__format__(__printf__,3,4)));
 void	vprintf(const char *, _BSD_VA_LIST_);
 int	vsprintf(char *, const char *, _BSD_VA_LIST_);
 int	vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_);
 int	humanize_number(char *, size_t, uint64_t, const char *, int);
 void	twiddle(void);
 #endif /* _KERNEL */
 void	panic(const char *, ...)
     __dead __attribute__((__format__(__printf__,1,2)));
 void	uprintf(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	uprintf_locked(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void	ttyprintf(struct tty *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
 char	*bitmask_snprintf(u_quad_t, const char *, char *, size_t);
 int	format_bytes(char *, size_t, uint64_t);
 void	tablefull(const char *, const char *);
 int	kcopy(const void *, void *, size_t);
 #ifdef _KERNEL
 #define bcopy(src, dst, len)	memcpy((dst), (src), (len))
 #define bzero(src, len)		memset((src), 0, (len))
 #define bcmp(a, b, len)		memcmp((a), (b), (len))
 #endif /* KERNEL */
 int	copystr(const void *, void *, size_t, size_t *);
 int	copyinstr(const void *, void *, size_t, size_t *);
 int	copyoutstr(const void *, void *, size_t, size_t *);
 int	copyin(const void *, void *, size_t);
 int	copyout(const void *, void *, size_t);
 #ifdef _KERNEL
 typedef	int	(*copyin_t)(const void *, void *, size_t);
 typedef int	(*copyout_t)(const void *, void *, size_t);
 #endif
 int	copyin_proc(struct proc *, const void *, void *, size_t);
 int	copyout_proc(struct proc *, const void *, void *, size_t);
 int	copyin_vmspace(struct vmspace *, const void *, void *, size_t);
 int	copyout_vmspace(struct vmspace *, const void *, void *, size_t);
 int	ioctl_copyin(int ioctlflags, const void *src, void *dst, size_t len);
 int	ioctl_copyout(int ioctlflags, const void *src, void *dst, size_t len);
 int	ucas_ptr(volatile void *, void *, void *, void *);
 int	ucas_int(volatile int *, int, int, int *);
 int	subyte(void *, int);
 int	suibyte(void *, int);
 int	susword(void *, short);
 int	suisword(void *, short);
 int	suswintr(void *, short);
 int	suword(void *, long);
 int	suiword(void *, long);
 int	fubyte(const void *);
 int	fuibyte(const void *);
 int	fusword(const void *);
 int	fuisword(const void *);
 int	fuswintr(const void *);
 long	fuword(const void *);
 long	fuiword(const void *);
 void	hardclock(struct clockframe *);
 void	softclock(void *);
 void	statclock(struct clockframe *);
 #ifdef NTP
 void	ntp_init(void);
 #ifdef PPS_SYNC
 void	hardpps(struct timespec *, long);
 #endif /* PPS_SYNC */
 #else
 void	ntp_init(void);	/* also provides adjtime() functionality */
 #endif /* NTP */
 void	ssp_init(void);
 void	initclocks(void);
 void	inittodr(time_t);
 void	resettodr(void);
 void	cpu_initclocks(void);
 void	setrootfstime(time_t);
 void	startprofclock(struct proc *);
 void	stopprofclock(struct proc *);
 void	proftick(struct clockframe *);
 void	setstatclockrate(int);
 /*
  * Shutdown hooks.  Functions to be run with all interrupts disabled
  * immediately before the system is halted or rebooted.
  */
 void	*shutdownhook_establish(void (*)(void *), void *);
 void	shutdownhook_disestablish(void *);
 void	doshutdownhooks(void);
 /*
  * Power management hooks.
  */
 void	*powerhook_establish(const char *, void (*)(int, void *), void *);
 void	powerhook_disestablish(void *);
 void	dopowerhooks(int);
 #define PWR_RESUME	0
 #define PWR_SUSPEND	1
 #define PWR_STANDBY	2
 #define PWR_SOFTRESUME	3
 #define PWR_SOFTSUSPEND	4
 #define PWR_SOFTSTANDBY	5
 #define PWR_NAMES \
 	"resume",	/* 0 */ \
 	"suspend",	/* 1 */ \
 	"standby",	/* 2 */ \
 	"softresume",	/* 3 */ \
 	"softsuspend",	/* 4 */ \
 	"softstandby"	/* 5 */
 /*
  * Mountroot hooks (and mountroot declaration).  Device drivers establish
  * these to be executed just before (*mountroot)() if the passed device is
  * selected as the root device.
  */
 extern int (*mountroot)(void);
 void	*mountroothook_establish(void (*)(struct device *), struct device *);
 void	mountroothook_disestablish(void *);
 void	mountroothook_destroy(void);
 void	domountroothook(void);
 /*
  * Exec hooks. Subsystems may want to do cleanup when a process
  * execs.
  */
 void	*exechook_establish(void (*)(struct proc *, void *), void *);
 void	exechook_disestablish(void *);
 void	doexechooks(struct proc *);
 /*
  * Exit hooks. Subsystems may want to do cleanup when a process exits.
  */
 void	*exithook_establish(void (*)(struct proc *, void *), void *);
 void	exithook_disestablish(void *);
 void	doexithooks(struct proc *);
 /*
  * Fork hooks.  Subsystems may want to do special processing when a process
  * forks.
  */
 void	*forkhook_establish(void (*)(struct proc *, struct proc *));
 void	forkhook_disestablish(void *);
 void	doforkhooks(struct proc *, struct proc *);
 /*
  * kernel syscall tracing/debugging hooks.
  */
 #ifdef _KERNEL
 bool	trace_is_enabled(struct proc *);
 int	trace_enter(register_t, const register_t *, int);
 void	trace_exit(register_t, register_t [], int);
 #endif
 int	uiomove(void *, size_t, struct uio *);
 int	uiomove_frombuf(void *, size_t, struct uio *);
 #ifdef _KERNEL
 int	setjmp(label_t *);
 void	longjmp(label_t *) __dead;
 #endif
 void	consinit(void);
 void	cpu_startup(void);
 void	cpu_configure(void);
 void	cpu_rootconf(void);
 void	cpu_dumpconf(void);
 #ifdef GPROF
 void	kmstartup(void);
 #endif
 #ifdef _KERNEL
 #include <lib/libkern/libkern.h>
 /*
  * Stuff to handle debugger magic key sequences.
  */
 #define CNS_LEN			128
 #define CNS_MAGIC_VAL(x)	((x)&0x1ff)
 #define CNS_MAGIC_NEXT(x)	(((x)>>9)&0x7f)
 #define CNS_TERM		0x7f	/* End of sequence */
 typedef struct cnm_state {
 	int	cnm_state;
 	u_short	*cnm_magic;
 } cnm_state_t;
 /* Override db_console() in MD headers */
 #ifndef cn_trap
 #define cn_trap()	console_debugger()
 #endif
 #ifndef cn_isconsole
 #define cn_isconsole(d)	(cn_tab != NULL && (d) == cn_tab->cn_dev)
 #endif
 void cn_init_magic(cnm_state_t *);
 void cn_destroy_magic(cnm_state_t *);
 int cn_set_magic(const char *);
 int cn_get_magic(char *, size_t);
 /* This should be called for each byte read */
 #ifndef cn_check_magic
 #define cn_check_magic(d, k, s)						\
 	do {								\
 		if (cn_isconsole(d)) {					\
 			int _v = (s).cnm_magic[(s).cnm_state];		\
 			if ((k) == CNS_MAGIC_VAL(_v)) {			\
 				(s).cnm_state = CNS_MAGIC_NEXT(_v);	\
 				if ((s).cnm_state == CNS_TERM) {	\
 					cn_trap();			\
 					(s).cnm_state = 0;		\
 				}					\
 			} else {					\
 				(s).cnm_state = 0;			\
 			}						\
 		}							\
 	} while (/* CONSTCOND */ 0)
 #endif
 /* Encode out-of-band events this way when passing to cn_check_magic() */
 #define	CNC_BREAK		0x100
 #if defined(DDB) || defined(sun3) || defined(sun2)
 /* note that cpu_Debugger() is always available on sun[23] */
 void	cpu_Debugger(void);
 #define Debugger	cpu_Debugger
 #endif
 #ifdef DDB
 /*
  * Enter debugger(s) from console attention if enabled
  */
 extern int db_fromconsole; /* XXX ddb/ddbvar.h */
 #define console_debugger() if (db_fromconsole) Debugger()
 #elif defined(Debugger)
 #define console_debugger() Debugger()
 #else
 #define console_debugger() do {} while (/* CONSTCOND */ 0) /* NOP */
 #endif
 #endif /* _KERNEL */
 /* For SYSCALL_DEBUG */
 void scdebug_call(register_t, const register_t[]);
 void scdebug_ret(register_t, int, const register_t[]);
 void	kernel_lock_init(void);
 void	_kernel_lock(int);
 void	_kernel_unlock(int, int *);
 #if defined(MULTIPROCESSOR) || defined(_LKM)
 #define	KERNEL_LOCK(count, lwp)			\
 do {						\
 	if ((count) != 0)			\
 		_kernel_lock((count));	\
 } while (/* CONSTCOND */ 0)
 #define	KERNEL_UNLOCK(all, lwp, p)	_kernel_unlock((all), (p))
 #else
 #define	KERNEL_LOCK(count, lwp)		do {(void)(count); (void)(lwp);} while (/* CONSTCOND */ 0) /*NOP*/
 #define	KERNEL_UNLOCK(all, lwp, ptr)	do {(void)(all); (void)(lwp); (void)(ptr);} while (/* CONSTCOND */ 0) /*NOP*/
 #endif
 #define	KERNEL_UNLOCK_LAST(l)		KERNEL_UNLOCK(-1, (l), NULL)
 #define	KERNEL_UNLOCK_ALL(l, p)		KERNEL_UNLOCK(0, (l), (p))
 #define	KERNEL_UNLOCK_ONE(l)		KERNEL_UNLOCK(1, (l), NULL)
 /* Preemption control. */
 #ifdef _KERNEL
 void	kpreempt_disable(void);
 void	kpreempt_enable(void);
 bool	kpreempt_disabled(void);
 #endif
 void assert_sleepable(void);
 #if defined(DEBUG)
 #define	ASSERT_SLEEPABLE()	assert_sleepable()
 #else /* defined(DEBUG) */
 #define	ASSERT_SLEEPABLE()	/* nothing */
 #endif /* defined(DEBUG) */
 vaddr_t calc_cache_size(struct vm_map *, int, int);
 #endif	/* !_SYS_SYSTM_H_ */