From owner-p4-projects Thu May 2 10:44:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE36037B41B; Thu, 2 May 2002 10:44:39 -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 3FA7837B41C for ; Thu, 2 May 2002 10:44:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42Hib371380 for perforce@freebsd.org; Thu, 2 May 2002 10:44:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 May 2002 10:44:37 -0700 (PDT) Message-Id: <200205021744.g42Hib371380@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 10700 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=10700 Change 10700 by rwatson@rwatson_tislabs on 2002/05/02 10:43:48 Sync MAC to recent GENERIC updates. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#27 (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.338 2002/04/09 11:18:38 phk Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.340 2002/04/27 01:31:16 scottl Exp $ machine i386 cpu I486_CPU @@ -60,7 +60,7 @@ 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 mutex checks to detects deadlocks and cycles +options WITNESS #Enable checks to detects deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options ALT_BREAK_TO_DEBUGGER @@ -120,6 +120,7 @@ # 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 mlx # Mylex DAC960 family To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message