PERFORCE change 52023 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=52023

Change 52023 by rwatson at rwatson_tislabs on 2004/04/30 20:37:54

	Manually integrate changes from GENERIC to MAC from recent
	integrations of the MAC branch from the FreeBSD CVS repository.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#52 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#52 (text+ko) ====

@@ -12,11 +12,11 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# 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 
+# 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: src/sys/i386/conf/GENERIC,v 1.386 2003/06/08 02:03:01 jmallett Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.398 2004/03/15 00:49:40 obrien Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -26,9 +26,9 @@
 maxusers	0
 
 #To statically compile in device wiring instead of /boot/device.hints
-#hints		"MAC.hints"		#Default places to look for devices.
+#hints		"MAC.hints"		# Default places to look for devices.
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	MAC
 #options 	MAC_ALWAYS_LABEL_MBUF
@@ -39,47 +39,47 @@
 options 	UFS_EXTATTR
 options 	UFS_EXTATTR_AUTOSTART
 
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	INET6			#IPv6 communications protocols
-options 	FFS			#Berkeley Fast Filesystem
-options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	UFS_ACL			#Support for access control lists
-options 	UFS_DIRHASH		#Improve performance on big directories
-options 	MD_ROOT			#MD is a potential root device
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options 	MSDOSFS			#MSDOS Filesystem
-options 	CD9660			#ISO 9660 Filesystem
-options 	PROCFS			#Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
-options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
-options 	KTRACE			#ktrace(1) support
-options 	SYSVSHM			#SYSV-style shared memory
-options 	SYSVMSG			#SYSV-style message queues
-options 	SYSVSEM			#SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-#options        P1003_1B_SEMAPHORES     #POSIX P1003_1B semaphores
+options 	SCHED_ULE		# ULE scheduler
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	MD_ROOT			# MD is a potential root device
+options 	NFSCLIENT		# Network Filesystem Client
+options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
+options 	SCSI_DELAY=15000	# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
 options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~215k to driver.
+options 	PFIL_HOOKS		# pfil(9) framework
 
 # Debugging for use in -current
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
-options 	DDB			#Enable the kernel debugger
-options 	INVARIANTS		#Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			#Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+options 	DDB			# Enable the kernel debugger
+options 	INVARIANTS		# Enable calls of extra sanity checking
+options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 
 # To make an SMP kernel, the next two are needed
-#options 	SMP			# Symmetric MultiProcessor Kernel
-#options 	APIC_IO			# Symmetric (APIC) I/O
+options 	SMP		# Symmetric MultiProcessor Kernel
+device  	apic		# I/O APIC
 
 device		isa
 device		eisa
@@ -90,11 +90,12 @@
 
 # ATA and ATAPI devices
 device		ata
-device		atadisk			# ATA disk drives
-device		atapicd			# ATAPI CDROM drives
-device		atapifd			# ATAPI floppy drives
-device		atapist			# ATAPI tape drives
-options 	ATA_STATIC_ID		#Static device numbering
+device		atadisk		# ATA disk drives
+device		ataraid		# ATA RAID drives
+device		atapicd		# ATAPI CDROM drives
+device		atapifd		# ATAPI floppy drives
+device		atapist		# ATAPI tape drives
+options 	ATA_STATIC_ID	# Static device numbering
 
 # SCSI Controllers
 device		ahb		# EISA AHA1742 family
@@ -117,13 +118,6 @@
 device		nsp		# Workbit Ninja SCSI-3
 device		stg		# TMC 18C30/18C50
 
-# RAID controllers interfaced to the SCSI subsystem
-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
-device		ciss		# Compaq Smart RAID 5*
-device		dpt		# DPT Smartcache III, IV - See NOTES for options!
-device		iir		# Intel Integrated RAID
-device		mly		# Mylex AcceleRAID/eXtremeRAID
-
 # SCSI peripherals
 device		scbus		# SCSI bus (required for SCSI)
 device		ch		# SCSI media changers
@@ -133,12 +127,19 @@
 device		pass		# Passthrough device (direct SCSI access)
 device		ses		# SCSI Environmental Services (and SAF-TE)
 
+# RAID controllers interfaced to the SCSI subsystem
+device		amr		# AMI MegaRAID
+device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
+device		ciss		# Compaq Smart RAID 5*
+device		dpt		# DPT Smartcache III, IV - See NOTES for options
+device		iir		# Intel Integrated RAID
+device		ips		# IBM (Adaptec) ServeRAID
+device		mly		# Mylex AcceleRAID/eXtremeRAID
+
 # RAID controllers
 device		aac		# Adaptec FSA RAID
 device		aacp		# SCSI passthrough for aac (requires CAM)
-device		amr		# AMI MegaRAID
 device		ida		# Compaq Smart RAID
-device		ips		# IBM (Adaptec) ServeRAID
 device		mlx		# Mylex DAC960 family
 device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
@@ -157,8 +158,8 @@
 
 # Enable this for the pcvt (VT220 compatible) console driver
 #device		vt
-#options 	XSERVER			# support for X server on a vt console
-#options 	FAT_CURSOR		# start with block cursor
+#options 	XSERVER		# support for X server on a vt console
+#options 	FAT_CURSOR	# start with block cursor
 
 device		agp		# support several AGP chipsets
 
@@ -171,11 +172,11 @@
 device		pmtimer
 
 # PCCARD (PCMCIA) support
-# Pcmcia and cardbus bridge support
-device		cbb			# cardbus (yenta) bridge
-#device		pcic			# ExCA ISA and PCI bridges
-device		pccard			# PC Card (16-bit) bus
-device		cardbus			# CardBus (32-bit) bus
+# PCMCIA and cardbus bridge support
+device		cbb		# cardbus (yenta) bridge
+#device		pcic		# ExCA ISA and PCI bridges
+device		pccard		# PC Card (16-bit) bus
+device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports
 device		sio		# 8250, 16[45]50 based serial ports
@@ -188,6 +189,10 @@
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
+# If you've got a "dumb" serial or parallel PCI card that is
+# supported by the puc(4) glue driver, uncomment the following
+# line to enable it (connects to the sio and/or ppc drivers):
+#device		puc
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
@@ -198,6 +203,8 @@
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
+device		bfe		# Broadcom BCM440x 10/100 ethernet
+device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message