diff options
author | jhb <jhb@FreeBSD.org> | 2010-11-01 17:40:35 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2010-11-01 17:40:35 +0000 |
commit | c7dd85142ceb048a08bf4d4b0cd555ebdeff667a (patch) | |
tree | 5454d13423bd8880778afe99d72bf142693b2212 | |
parent | 8372ad0fde50dc7d92cb1ab2439d7ba31188817f (diff) | |
download | FreeBSD-src-c7dd85142ceb048a08bf4d4b0cd555ebdeff667a.zip FreeBSD-src-c7dd85142ceb048a08bf4d4b0cd555ebdeff667a.tar.gz |
Move the <machine/mca.h> header to <x86/mca.h>.
-rw-r--r-- | sys/amd64/acpica/acpi_wakeup.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/trap.c | 2 | ||||
-rw-r--r-- | sys/i386/acpica/acpi_wakeup.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/mp_machdep.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/trap.c | 2 | ||||
-rw-r--r-- | sys/i386/include/mca.h | 56 | ||||
-rw-r--r-- | sys/pc98/include/mca.h | 6 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 2 | ||||
-rw-r--r-- | sys/x86/include/mca.h (renamed from sys/amd64/include/mca.h) | 6 | ||||
-rw-r--r-- | sys/x86/x86/local_apic.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/mca.c | 2 |
14 files changed, 14 insertions, 76 deletions
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 9afb36c..534a774 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -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> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 61a2cf8..eba788f 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -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> diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index c509b67..26ad9fd 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -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> diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 69e94d9..786d8ec 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -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 diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 60bc31f..2397d80 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -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> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 5c0b7ff..255bec6 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -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> diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index c69f6f9..d986609 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -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> diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 7b7bdc4..dc10559 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -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 diff --git a/sys/i386/include/mca.h b/sys/i386/include/mca.h deleted file mode 100644 index dd6e69c..0000000 --- a/sys/i386/include/mca.h +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * Copyright (c) 2009 Advanced Computing Technologies LLC - * Written by: John H. Baldwin <jhb@FreeBSD.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef __MACHINE_MCA_H__ -#define __MACHINE_MCA_H__ - -struct mca_record { - uint64_t mr_status; - uint64_t mr_addr; - uint64_t mr_misc; - uint64_t mr_tsc; - int mr_apic_id; - int mr_bank; - uint64_t mr_mcg_cap; - uint64_t mr_mcg_status; - int mr_cpu_id; - int mr_cpu_vendor_id; - int mr_cpu; -}; - -#ifdef _KERNEL - -void cmc_intr(void); -void mca_init(void); -int mca_intr(void); -void mca_resume(void); - -#endif - -#endif /* !__MACHINE_MCA_H__ */ diff --git a/sys/pc98/include/mca.h b/sys/pc98/include/mca.h deleted file mode 100644 index a047f87..0000000 --- a/sys/pc98/include/mca.h +++ /dev/null @@ -1,6 +0,0 @@ -/*- - * This file is in the public domain. - */ -/* $FreeBSD$ */ - -#include <i386/mca.h> diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 32328c5..e01ef68 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -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> diff --git a/sys/amd64/include/mca.h b/sys/x86/include/mca.h index dd6e69c..9322737 100644 --- a/sys/amd64/include/mca.h +++ b/sys/x86/include/mca.h @@ -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__ */ diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 6c72d28..76898f1 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -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> diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index a5567e0..5ee090b 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -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> |