From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 16:24:28 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C59637B404; Mon, 28 Apr 2003 16:24:28 -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 BE22937B401
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 16:24:27 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 44C9D43FA3
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 16:24:27 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3SNOR0U088480
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 16:24:27 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNOQNN088471
	for perforce@freebsd.org; Mon, 28 Apr 2003 16:24:26 -0700 (PDT)
Date: Mon, 28 Apr 2003 16:24:26 -0700 (PDT)
Message-Id: <200304282324.h3SNOQNN088471@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30005 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Apr 2003 23:24:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=30005

Change 30005 by peter@peter_overcee on 2003/04/28 16:23:51

	s/x86_64/amd64/

Affected files ...

.. //depot/projects/hammer/sys/x86_64/isa/clock.c#11 edit
.. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#14 edit
.. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#5 edit
.. //depot/projects/hammer/sys/x86_64/isa/ithread.c#5 edit
.. //depot/projects/hammer/sys/x86_64/isa/npx.c#20 edit
.. //depot/projects/hammer/sys/x86_64/isa/vector.s#9 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/isa/clock.c#11 (text+ko) ====

@@ -71,15 +71,15 @@
 #include <machine/psl.h>
 #include <machine/specialreg.h>
 
-#include <x86_64/isa/icu.h>
-#include <x86_64/isa/isa.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/isa.h>
 #include <isa/rtc.h>
 #ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif
-#include <x86_64/isa/timerreg.h>
+#include <amd64/isa/timerreg.h>
 
-#include <x86_64/isa/intr_machdep.h>
+#include <amd64/isa/intr_machdep.h>
 
 /*
  * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we

==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#14 (text+ko) ====

@@ -57,13 +57,13 @@
 #include <machine/md_var.h>
 #include <machine/segments.h>
 
-#include <x86_64/isa/isa.h>
-#include <x86_64/isa/icu.h>
+#include <amd64/isa/isa.h>
+#include <amd64/isa/icu.h>
 
 #ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif
-#include <x86_64/isa/intr_machdep.h>
+#include <amd64/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 
 /*

==== //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#5 (text+ko) ====

@@ -59,7 +59,7 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <x86_64/isa/isa.h>
+#include <amd64/isa/isa.h>
 #include <dev/ic/i8237.h>
 #include <isa/isavar.h>
 

==== //depot/projects/hammer/sys/x86_64/isa/ithread.c#5 (text+ko) ====

@@ -37,9 +37,9 @@
 #include <sys/systm.h>
 #include <sys/vmmeter.h>
 
-#include <x86_64/isa/icu.h>
-#include <x86_64/isa/intr_machdep.h>
-#include <x86_64/isa/isa.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/intr_machdep.h>
+#include <amd64/isa/isa.h>
 
 struct int_entropy {
 	struct proc *p;

==== //depot/projects/hammer/sys/x86_64/isa/npx.c#20 (text+ko) ====

@@ -67,7 +67,7 @@
 #include <machine/segments.h>
 #include <machine/ucontext.h>
 
-#include <x86_64/isa/intr_machdep.h>
+#include <amd64/isa/intr_machdep.h>
 #ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif

==== //depot/projects/hammer/sys/x86_64/isa/vector.s#9 (text+ko) ====

@@ -3,9 +3,9 @@
  * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $
  */
 
-#include <x86_64/isa/icu.h>
-#include <x86_64/isa/isa.h>
-#include <x86_64/isa/intr_machdep.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/isa.h>
+#include <amd64/isa/intr_machdep.h>
 
 	.data
 	ALIGN_DATA
@@ -73,4 +73,4 @@
  * loading segregs.
  */
 
-#include "x86_64/isa/icu_vector.s"
+#include "amd64/isa/icu_vector.s"