svn commit: r214630 - in head/sys: amd64/acpica amd64/amd64 amd64/include i386/acpica i386/i386 i386/include pc98/include pc98/pc98 x86/include x86/x86

[John Baldwin]

Author: jhb
Date: Mon Nov  1 17:40:35 2010
New Revision: 214630
URL: http://svn.freebsd.org/changeset/base/214630

Log:
  Move the <machine/mca.h> header to <x86/mca.h>.

Added:
  head/sys/x86/include/mca.h
     - copied, changed from r214624, head/sys/amd64/include/mca.h
Deleted:
  head/sys/amd64/include/mca.h
  head/sys/i386/include/mca.h
  head/sys/pc98/include/mca.h
Modified:
  head/sys/amd64/acpica/acpi_wakeup.c
  head/sys/amd64/amd64/machdep.c
  head/sys/amd64/amd64/mp_machdep.c
  head/sys/amd64/amd64/trap.c
  head/sys/i386/acpica/acpi_wakeup.c
  head/sys/i386/i386/machdep.c
  head/sys/i386/i386/mp_machdep.c
  head/sys/i386/i386/trap.c
  head/sys/pc98/pc98/machdep.c
  head/sys/x86/x86/local_apic.c
  head/sys/x86/x86/mca.c

Modified: head/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/amd64/acpica/acpi_wakeup.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/amd64/acpica/acpi_wakeup.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/pcb.h>
 #include <machine/pmap.h>
 #include <machine/specialreg.h>

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/amd64/amd64/machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -112,7 +112,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/pc/bios.h>

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/amd64/amd64/mp_machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/clock.h>
 #include <machine/cputypes.h>
 #include <machine/cpufunc.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>

Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/amd64/amd64/trap.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #ifdef SMP

Modified: head/sys/i386/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/i386/acpica/acpi_wakeup.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/i386/acpica/acpi_wakeup.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/segments.h>
 
 #include <contrib/dev/acpica/include/acpi.h>

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/i386/i386/machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -115,7 +115,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/pc/bios.h>

Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/i386/i386/mp_machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/apicreg.h>
 #include <machine/clock.h>
 #include <machine/cputypes.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>

Modified: head/sys/i386/i386/trap.c
==============================================================================
--- head/sys/i386/i386/trap.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/i386/i386/trap.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #ifdef SMP

Modified: head/sys/pc98/pc98/machdep.c
==============================================================================
--- head/sys/pc98/pc98/machdep.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/pc98/pc98/machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -112,7 +112,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/intr_machdep.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
 #include <machine/pcb.h>

Copied and modified: head/sys/x86/include/mca.h (from r214624, head/sys/amd64/include/mca.h)
==============================================================================
--- head/sys/amd64/include/mca.h	Mon Nov  1 11:38:04 2010	(r214624, copy source)
+++ head/sys/x86/include/mca.h	Mon Nov  1 17:40:35 2010	(r214630)
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-#ifndef __MACHINE_MCA_H__
-#define	__MACHINE_MCA_H__
+#ifndef __X86_MCA_H__
+#define	__X86_MCA_H__
 
 struct mca_record {
 	uint64_t	mr_status;
@@ -53,4 +53,4 @@ void	mca_resume(void);
 
 #endif
 
-#endif /* !__MACHINE_MCA_H__ */
+#endif /* !__X86_MCA_H__ */

Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/x86/x86/local_apic.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
 #include <machine/specialreg.h>

Modified: head/sys/x86/x86/mca.c
==============================================================================
--- head/sys/x86/x86/mca.c	Mon Nov  1 17:34:04 2010	(r214629)
+++ head/sys/x86/x86/mca.c	Mon Nov  1 17:40:35 2010	(r214630)
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
 #include <machine/cputypes.h>
-#include <machine/mca.h>
+#include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>