PERFORCE change 30005 for review

[Peter Wemm]

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

Change 30005 by peter at 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"