upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
John Baldwin 2010-11-01 17:40:35 +00:00
parent 544de89de0
commit 5ecdb3c46b
14 changed files with 14 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/amd64/acpica/acpi_wakeup.c
View file

@ -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>

2
sys/amd64/amd64/machdep.c
View file

@ -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>

2
sys/amd64/amd64/mp_machdep.c
View file

@ -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>

2
sys/amd64/amd64/trap.c
View file

@ -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

2
sys/i386/acpica/acpi_wakeup.c
View file

@ -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>

2
sys/i386/i386/machdep.c
View file

@ -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>

2
sys/i386/i386/mp_machdep.c
View file

@ -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>

2
sys/i386/i386/trap.c
View file

@ -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

56
sys/i386/include/mca.h
View file

@ -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__ */

6
sys/pc98/include/mca.h
View file

@ -1,6 +0,0 @@
/*-
* This file is in the public domain.
*/
/* $FreeBSD$ */
#include <i386/mca.h>

2
sys/pc98/pc98/machdep.c
View file

@ -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>

6
sys/amd64/include/mca.h → sys/x86/include/mca.h
View file

@ -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__ */

2
sys/x86/x86/local_apic.c
View file

@ -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>

2
sys/x86/x86/mca.c
View file

@ -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>