Index: sys/conf/files
===================================================================
RCS file: /cvsroot/src/sys/conf/files,v
retrieving revision 1.929
diff -u -p -r1.929 files
--- sys/conf/files	19 Nov 2008 18:36:06 -0000	1.929
+++ sys/conf/files	22 Nov 2008 12:34:24 -0000
@@ -92,13 +92,6 @@ defflag	opt_veriexec.h		VERIFIED_EXEC_FP
 				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
@@ -1320,6 +1313,8 @@ include "secmodel/files.secmodel"
 #
 # kernel sources
 #
+include "kern/files.kern"
+
 file	compat/common/compat_mod.c	compat_netbsd
 file	compat/sa/compat_sa.c
 file	conf/debugsyms.c
@@ -1354,160 +1349,6 @@ 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		exec_elf32
-file	kern/core_elf64.c		exec_elf64
-file	kern/core_netbsd.c		exec_aout | exec_coff |
-					exec_ecoff | exec_macho
-file	kern/cnmagic.c
-file	kern/exec_aout.c		exec_aout
-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		coredump
-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 | modular needs-flag
-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_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_exec_fd.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			aio
-file	kern/sys_descrip.c
-file	kern/sys_generic.c
-file	kern/sys_module.c
-file	kern/sys_mqueue.c		mqueue
-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_cwd.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
@@ -1550,6 +1391,7 @@ 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/link_proto.c
 file	net/pfil.c			pfil_hooks | ipfilter | pf
 file	net/ppp-deflate.c		ppp & ppp_deflate
 file	net/ppp_tty.c			ppp
Index: sys/kern/files.kern
===================================================================
RCS file: sys/kern/files.kern
diff -N sys/kern/files.kern
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/kern/files.kern	22 Nov 2008 12:34:24 -0000
@@ -0,0 +1,166 @@
+#	$NetBSD $
+
+# 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
+
+#
+# kernel sources
+#
+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               exec_elf32
+file    kern/core_elf64.c               exec_elf64
+file    kern/core_netbsd.c              exec_aout | exec_coff |
+                                        exec_ecoff | exec_macho
+file    kern/cnmagic.c
+file    kern/exec_aout.c                exec_aout
+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                coredump
+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 | modular needs-flag
+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_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_exec_fd.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                  aio
+file    kern/sys_descrip.c
+file    kern/sys_generic.c
+file    kern/sys_module.c
+file    kern/sys_mqueue.c               mqueue
+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    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_cwd.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
+