From owner-p4-projects@FreeBSD.ORG Sun May 16 13:34:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48D5616A4D1; Sun, 16 May 2004 13:34:35 -0700 (PDT) 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 21F8C16A4CE for ; Sun, 16 May 2004 13:34:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC92643D39 for ; Sun, 16 May 2004 13:34:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4GKYUGe006526 for ; Sun, 16 May 2004 13:34:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4GKYUkD006523 for perforce@freebsd.org; Sun, 16 May 2004 13:34:30 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 16 May 2004 13:34:30 -0700 (PDT) Message-Id: <200405162034.i4GKYUkD006523@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 Subject: PERFORCE change 52871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2004 20:34:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=52871 Change 52871 by peter@peter_overcee on 2004/05/16 13:33:36 IFC @52870 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#32 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#22 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#22 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#31 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#40 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#18 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#23 integrate .. //depot/projects/hammer/sys/amd64/isa/elcr.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#21 integrate .. //depot/projects/hammer/sys/amd64/isa/nmi.c#12 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#19 integrate .. //depot/projects/hammer/sys/conf/files.amd64#45 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#32 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.11 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.4 2003/11/17 06:10:14 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.5 2004/05/16 20:30:46 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.7 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.8 2004/05/16 20:30:46 peter Exp $"); #include "opt_atpic.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.52 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.53 2004/05/16 20:30:46 peter Exp $"); /* * This code implements a system driver for legacy systems that do not ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#36 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.8 2004/03/08 00:15:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.9 2004/05/16 20:30:46 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.229 2003/12/11 02:47:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.230 2004/05/16 20:30:46 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.1 2003/11/03 22:12:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.2 2004/05/16 20:30:46 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.58 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.59 2004/05/16 20:30:46 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#22 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.6 2003/11/17 08:58:14 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.7 2004/05/16 20:30:46 peter Exp $ */ #ifndef _MACHINE_APICVAR_H_ ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.2 2003/11/14 19:10:13 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.3 2004/05/16 20:30:46 peter Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ ==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.4 2003/09/23 00:03:44 peter Exp $ + * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.5 2004/05/16 20:30:46 peter Exp $ */ #ifndef _MACHINE_LEGACYVAR_H_ ==== //depot/projects/hammer/sys/amd64/include/pmap.h#31 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.113 2004/04/10 22:41:45 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.114 2004/05/16 20:30:46 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#40 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.10 2004/03/17 17:50:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.11 2004/05/16 20:30:47 peter Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#18 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.42 2004/04/05 21:25:52 imp Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.43 2004/05/16 20:30:47 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/clock.c#23 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.208 2004/04/05 21:25:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.209 2004/05/16 20:30:47 peter Exp $"); /* * Routines to handle clock hardware. ==== //depot/projects/hammer/sys/amd64/isa/elcr.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/elcr.c,v 1.1 2004/05/04 20:07:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/elcr.c,v 1.1 2004/05/04 20:07:45 jhb Exp $"); /* * The ELCR is a register that controls the trigger mode and polarity of ==== //depot/projects/hammer/sys/amd64/isa/icu.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.33 2004/04/05 21:25:52 imp Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.34 2004/05/16 20:30:47 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/nmi.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/nmi.c,v 1.79 2004/04/05 21:25:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/nmi.c,v 1.80 2004/05/16 20:30:47 peter Exp $"); #include "opt_mca.h" ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.108 2004/05/16 20:30:47 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/conf/files.amd64#45 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.32 2004/05/16 20:11:38 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.33 2004/05/16 20:30:47 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and