From owner-p4-projects@FreeBSD.ORG Sun Mar 5 04:37:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A635316A424; Sun, 5 Mar 2006 04:37:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D27216A422 for ; Sun, 5 Mar 2006 04:37:07 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E418943D45 for ; Sun, 5 Mar 2006 04:37:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k254b6BV013236 for ; Sun, 5 Mar 2006 04:37:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k254b6Fi013233 for perforce@freebsd.org; Sun, 5 Mar 2006 04:37:06 GMT (envelope-from peter@freebsd.org) Date: Sun, 5 Mar 2006 04:37:06 GMT Message-Id: <200603050437.k254b6Fi013233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 92766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2006 04:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92766 Change 92766 by peter@peter_overcee on 2006/03/05 04:36:50 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#47 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#66 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#151 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#116 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#89 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#15 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#93 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#42 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/mptable.h#11 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#56 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#46 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#47 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#66 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#151 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#116 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#89 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#93 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1217) +# (XXX from i386:NOTES,v 1.1220) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.51 2005/12/03 01:23:49 anholt Exp $ # @@ -171,11 +171,10 @@ # the tdfx DRI module from XFree86 and is completely unrelated. # # To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. +# config as well. The other option is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#XXX#options TDFX_LINUX # Enable Linuxulator support +#XXX#device tdfx_linux # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference @@ -281,6 +280,12 @@ device aac device aacp # SCSI Passthrough interface (optional, CAM required) +# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID +# controllers (SmartRAID V and VI and later). +# These controllers require the CAM infrastructure. +# +device asr + # # Highpoint RocketRAID 182x. This is really just software RAID on a # Marvell SATA chip. ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/mptable.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#56 (text+ko) ====