From owner-p4-projects Tue Apr 16 18:20:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D765B37B48B; Tue, 16 Apr 2002 18:20:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BFD8837B43E for ; Tue, 16 Apr 2002 18:19:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H1JrA01695 for perforce@freebsd.org; Tue, 16 Apr 2002 18:19:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 18:19:53 -0700 (PDT) Message-Id: <200204170119.g3H1JrA01695@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9869 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9869 Change 9869 by rwatson@rwatson_tislabs on 2002/04/16 18:19:01 Sync changes in GENERIC from integ to MAC kernel Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#21 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. 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.332 2001/12/14 16:27:08 iedowse Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.338 2002/04/09 11:18:38 phk Exp $ machine i386 cpu I486_CPU @@ -39,7 +39,7 @@ #options SEBSD #Warning, won't boot without a policy options INET #InterNETworking -options INET6 +options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_DIRHASH #Improve performance on big directories @@ -52,9 +52,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console -#options USERCONFIG #boot -c editor -#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues @@ -68,8 +65,8 @@ options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable mutex checks to detects deadlocks and cycles -options WITNESS_SKIPSPIN -options ALT_BREAK_TO_DEBUGGER +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options ALT_BREAK_TO_DEBUGGER # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel @@ -111,7 +108,9 @@ # 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message