Catch- and cleanup:

o  Fix and improve comments and references,
o  Add PFIL_HOOKS, UFS_ACL and UFS_DIRHASH,
o  Switch from SCHED_4BSD to SCHED_ULE,
o  Remove SCSI_DELAY (there's no SCSI support),

1 files changed, 35 insertions, 30 deletions

diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index 603181b..b7dad7d 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -5,7 +5,7 @@
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
 #
-#    http://www.FreeBSD.org/handbook/kernelconfig-config.html
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
@@ -13,46 +13,51 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../i386/conf/NOTES file.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES. Please note that this is the i386 NOTES, but it still contains
-# valuable info for ia64 too.
-#
-# For hardware specific information check HARDWARE.TXT
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check
+# first in NOTES.
 #
 # $FreeBSD$
 
-machine		ia64
+machine 	ia64
 cpu		ITANIUM
 ident		SKI
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-makeoptions	NO_MODULES=yes		#Ignore any x86 CPUTYPE
+makeoptions	DEBUG=-g	# Build kernel with debug information.
+makeoptions	NO_MODULES=yes	# Don't build any modules.
 
-options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	DDB
-options 	FFS			#Berkeley Fast Filesystem
-options 	INET			#InterNETworking
-options 	INET6			#IPv6 communications protocols
-options 	KTRACE			#ktrace(1) syscall trace support
-options 	MD_ROOT			#MD is a potential root device
-options 	PROCFS			#Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options         SCHED_4BSD              #4BSD scheduler
-options 	SCSI_DELAY=500		#Delay (in ms) before probing SCSI 
-options 	SKI
-options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	SYSVMSG			#SYSV-style message queues
-options 	SYSVSEM			#SYSV-style semaphores
-options 	SYSVSHM			#SYSV-style shared memory
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options 	COMPAT_43	# Compatible with BSD 4.3 [KEEP THIS!]
+options 	DDB		# Enable the kernel debugger
+options 	FFS		# Berkeley Fast Filesystem
+options 	INET		# InterNETworking
+options 	INET6		# IPv6 communications protocols
+options 	KTRACE		# ktrace(1) syscall trace support
+options 	MD_ROOT		# MD usable as root device
+options 	PFIL_HOOKS	# pfil(9) framework
+options 	PROCFS		# Process filesystem (/proc)
+options 	PSEUDOFS	# Pseudo-filesystem framework
+options 	SCHED_ULE	# ULE scheduler
+options 	SKI		# Include SKI support code
+options 	SOFTUPDATES	# Enable FFS soft updates support
+options 	SYSVMSG		# SYSV-style message queues
+options 	SYSVSEM		# SYSV-style semaphores
+options 	SYSVSHM		# SYSV-style shared memory
+options 	UFS_ACL		# Support for access control lists
+options 	UFS_DIRHASH	# Hash-based directory lookup scheme
+options 	_KPOSIX_PRIORITY_SCHEDULING	# Posix P1003_1B RT extensions
 
-device		acpi
-device		bpf		# Berkeley packet filter
+# Various "busses"
+device		acpi		# ACPI support (mandatory)
+device		pci		# PCI bus support
+
+# Various (pseudo) devices
 device		ether		# Ethernet support
 device		loop		# Network loopback
 device		md		# Memory "disks"
-device		pci
 device		pty		# Pseudo-ttys (telnet etc)
 device		random		# Entropy device
 device		tun		# Packet tunnel.
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+device		bpf		# Berkeley packet filter