From owner-p4-projects@FreeBSD.ORG Mon Nov 17 00:31:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82BBE16A4D0; Mon, 17 Nov 2003 00:31:57 -0800 (PST) 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 44E5916A4CE for ; Mon, 17 Nov 2003 00:31:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F32F43FB1 for ; Mon, 17 Nov 2003 00:31:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAH8VuXJ084659 for ; Mon, 17 Nov 2003 00:31:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH8Vt73084656 for perforce@freebsd.org; Mon, 17 Nov 2003 00:31:55 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 17 Nov 2003 00:31:55 -0800 (PST) Message-Id: <200311170831.hAH8Vt73084656@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 42648 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: Mon, 17 Nov 2003 08:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=42648 Change 42648 by peter@peter_overcee on 2003/11/17 00:31:21 The great $Id$ sync Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#19 edit .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#9 edit .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#15 edit .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#21 edit .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#24 edit .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#40 edit .. //depot/projects/hammer/sys/amd64/amd64/mpboot.S#7 edit .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#16 edit .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#6 edit .. //depot/projects/hammer/sys/amd64/include/apicreg.h#7 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#17 edit .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#10 edit .. //depot/projects/hammer/sys/amd64/include/mptable.h#7 edit .. //depot/projects/hammer/sys/amd64/include/smp.h#12 edit .. //depot/projects/hammer/sys/amd64/isa/atpic.c#28 edit .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#9 edit .. //depot/projects/hammer/sys/amd64/isa/nmi.c#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.94 2003/11/14 19:10:12 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.94 2003/11/14 19:10:12 jhb Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#15 (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/i386/i386/intr_machdep.c,v 1.4 2003/11/17 06:10:14 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.4 2003/11/17 06:10:14 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#21 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.6 2003/11/12 18:13:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.6 2003/11/12 18:13:57 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#24 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#40 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.225 2003/11/16 00:55:53 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.225 2003/11/16 00:55:53 bde Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" ==== //depot/projects/hammer/sys/amd64/amd64/mpboot.S#7 (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/i386/i386/mpboot.s,v 1.23 2003/11/03 22:32:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/mpboot.s,v 1.23 2003/11/03 22:32:03 jhb Exp $ */ #include /* miscellaneous asm macros */ ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.227 2003/11/14 22:29:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.227 2003/11/14 22:29:21 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/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.1 2003/11/03 22:12:37 jhb Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/include/apicreg.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $ */ #ifndef _MACHINE_APICREG_H_ ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#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/i386/include/apicvar.h,v 1.5 2003/11/14 22:21:30 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.5 2003/11/14 22:21:30 peter Exp $ */ #ifndef _MACHINE_APICVAR_H_ ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#10 (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/i386/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.2 2003/11/14 19:10:13 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ ==== //depot/projects/hammer/sys/amd64/include/mptable.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/mptable.h,v 1.221 2003/11/14 22:23:30 peter Exp $ + * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.221 2003/11/14 22:23:30 peter Exp $ */ #ifndef __MACHINE_MPTABLE_H__ ==== //depot/projects/hammer/sys/amd64/include/smp.h#12 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/i386/include/smp.h,v 1.77 2003/11/03 22:32:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.77 2003/11/03 22:32:04 jhb Exp $ * */ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#28 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.40 2003/11/14 20:06:24 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.s,v 1.40 2003/11/14 20:06:24 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/nmi.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/nmi.c,v 1.78 2003/11/04 13:01:41 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/nmi.c,v 1.78 2003/11/04 13:01:41 nyan Exp $"); #include "opt_mca.h"