diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/machdep.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/mp_watchdog.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/pmap.c | 2 | ||||
-rw-r--r-- | sys/amd64/include/apicvar.h | 224 | ||||
-rw-r--r-- | sys/amd64/include/smp.h | 2 | ||||
-rw-r--r-- | sys/amd64/vmm/vmm_ipi.c | 2 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_core.c | 2 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_piv.c | 2 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_ppro.c | 2 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_uncore.c | 2 | ||||
-rw-r--r-- | sys/dev/hwpmc/hwpmc_x86.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/mp_watchdog.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 2 | ||||
-rw-r--r-- | sys/i386/include/smp.h | 2 | ||||
-rw-r--r-- | sys/i386/xen/mptable.c | 2 | ||||
-rw-r--r-- | sys/pc98/include/apicvar.h | 6 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 2 | ||||
-rw-r--r-- | sys/x86/acpica/madt.c | 2 | ||||
-rw-r--r-- | sys/x86/acpica/srat.c | 2 | ||||
-rw-r--r-- | sys/x86/include/apicvar.h (renamed from sys/i386/include/apicvar.h) | 12 | ||||
-rw-r--r-- | sys/x86/x86/io_apic.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/local_apic.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/mca.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/mptable.c | 2 | ||||
-rw-r--r-- | sys/x86/x86/msi.c | 2 | ||||
-rw-r--r-- | sys/x86/xen/xen_intr.c | 2 |
27 files changed, 31 insertions, 259 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index f0d4ea8..52256f7 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -140,7 +140,7 @@ __FBSDID("$FreeBSD$"); #ifdef DEV_ATPIC #include <x86/isa/icu.h> #else -#include <machine/apicvar.h> +#include <x86/apicvar.h> #endif #include <isa/isareg.h> diff --git a/sys/amd64/amd64/mp_watchdog.c b/sys/amd64/amd64/mp_watchdog.c index 5cbd649..b1799a2 100644 --- a/sys/amd64/amd64/mp_watchdog.c +++ b/sys/amd64/amd64/mp_watchdog.c @@ -45,7 +45,7 @@ #include <machine/smp.h> #include <x86/apicreg.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/mp_watchdog.h> /* diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 912eddf..6675697 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -135,7 +135,7 @@ __FBSDID("$FreeBSD$"); #include <vm/uma.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h deleted file mode 100644 index e7423a3..0000000 --- a/sys/amd64/include/apicvar.h +++ /dev/null @@ -1,224 +0,0 @@ -/*- - * Copyright (c) 2003 John 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. - * 3. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * 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_APICVAR_H_ -#define _MACHINE_APICVAR_H_ - -#include <machine/segments.h> - -/* - * Local && I/O APIC variable definitions. - */ - -/* - * Layout of local APIC interrupt vectors: - * - * 0xff (255) +-------------+ - * | | 15 (Spurious / IPIs / Local Interrupts) - * 0xf0 (240) +-------------+ - * | | 14 (I/O Interrupts / Timer) - * 0xe0 (224) +-------------+ - * | | 13 (I/O Interrupts) - * 0xd0 (208) +-------------+ - * | | 12 (I/O Interrupts) - * 0xc0 (192) +-------------+ - * | | 11 (I/O Interrupts) - * 0xb0 (176) +-------------+ - * | | 10 (I/O Interrupts) - * 0xa0 (160) +-------------+ - * | | 9 (I/O Interrupts) - * 0x90 (144) +-------------+ - * | | 8 (I/O Interrupts / System Calls) - * 0x80 (128) +-------------+ - * | | 7 (I/O Interrupts) - * 0x70 (112) +-------------+ - * | | 6 (I/O Interrupts) - * 0x60 (96) +-------------+ - * | | 5 (I/O Interrupts) - * 0x50 (80) +-------------+ - * | | 4 (I/O Interrupts) - * 0x40 (64) +-------------+ - * | | 3 (I/O Interrupts) - * 0x30 (48) +-------------+ - * | | 2 (ATPIC Interrupts) - * 0x20 (32) +-------------+ - * | | 1 (Exceptions, traps, faults, etc.) - * 0x10 (16) +-------------+ - * | | 0 (Exceptions, traps, faults, etc.) - * 0x00 (0) +-------------+ - * - * Note: 0x80 needs to be handled specially and not allocated to an - * I/O device! - */ - -#define MAX_APIC_ID 0xfe -#define APIC_ID_ALL 0xff - -/* I/O Interrupts are used for external devices such as ISA, PCI, etc. */ -#define APIC_IO_INTS (IDT_IO_INTS + 16) -#define APIC_NUM_IOINTS 191 - -/* The timer interrupt is used for clock handling and drives hardclock, etc. */ -#define APIC_TIMER_INT (APIC_IO_INTS + APIC_NUM_IOINTS) - -/* - ********************* !!! WARNING !!! ****************************** - * Each local apic has an interrupt receive fifo that is two entries deep - * for each interrupt priority class (higher 4 bits of interrupt vector). - * Once the fifo is full the APIC can no longer receive interrupts for this - * class and sending IPIs from other CPUs will be blocked. - * To avoid deadlocks there should be no more than two IPI interrupts - * pending at the same time. - * Currently this is guaranteed by dividing the IPIs in two groups that have - * each at most one IPI interrupt pending. The first group is protected by the - * smp_ipi_mtx and waits for the completion of the IPI (Only one IPI user - * at a time) The second group uses a single interrupt and a bitmap to avoid - * redundant IPI interrupts. - */ - -/* Interrupts for local APIC LVT entries other than the timer. */ -#define APIC_LOCAL_INTS 240 -#define APIC_ERROR_INT APIC_LOCAL_INTS -#define APIC_THERMAL_INT (APIC_LOCAL_INTS + 1) -#define APIC_CMC_INT (APIC_LOCAL_INTS + 2) - -#define APIC_IPI_INTS (APIC_LOCAL_INTS + 3) -#define IPI_RENDEZVOUS (APIC_IPI_INTS) /* Inter-CPU rendezvous. */ -#define IPI_INVLTLB (APIC_IPI_INTS + 1) /* TLB Shootdown IPIs */ -#define IPI_INVLPG (APIC_IPI_INTS + 2) -#define IPI_INVLRNG (APIC_IPI_INTS + 3) -#define IPI_INVLCACHE (APIC_IPI_INTS + 4) -/* Vector to handle bitmap based IPIs */ -#define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 6) - -/* IPIs handled by IPI_BITMAPED_VECTOR (XXX ups is there a better place?) */ -#define IPI_AST 0 /* Generate software trap. */ -#define IPI_PREEMPT 1 -#define IPI_HARDCLOCK 2 -#define IPI_BITMAP_LAST IPI_HARDCLOCK -#define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) - -#define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ -#define IPI_SUSPEND (APIC_IPI_INTS + 8) /* Suspend CPU until restarted. */ -#define IPI_STOP_HARD (APIC_IPI_INTS + 9) /* Stop CPU with a NMI. */ - -/* - * The spurious interrupt can share the priority class with the IPIs since - * it is not a normal interrupt. (Does not use the APIC's interrupt fifo) - */ -#define APIC_SPURIOUS_INT 255 - -#ifndef LOCORE - -#define APIC_IPI_DEST_SELF -1 -#define APIC_IPI_DEST_ALL -2 -#define APIC_IPI_DEST_OTHERS -3 - -#define APIC_BUS_UNKNOWN -1 -#define APIC_BUS_ISA 0 -#define APIC_BUS_EISA 1 -#define APIC_BUS_PCI 2 -#define APIC_BUS_MAX APIC_BUS_PCI - -/* - * An APIC enumerator is a psuedo bus driver that enumerates APIC's including - * CPU's and I/O APIC's. - */ -struct apic_enumerator { - const char *apic_name; - int (*apic_probe)(void); - int (*apic_probe_cpus)(void); - int (*apic_setup_local)(void); - int (*apic_setup_io)(void); - SLIST_ENTRY(apic_enumerator) apic_next; -}; - -inthand_t - IDTVEC(apic_isr1), IDTVEC(apic_isr2), IDTVEC(apic_isr3), - IDTVEC(apic_isr4), IDTVEC(apic_isr5), IDTVEC(apic_isr6), - IDTVEC(apic_isr7), IDTVEC(cmcint), IDTVEC(errorint), - IDTVEC(spuriousint), IDTVEC(timerint); - -extern vm_paddr_t lapic_paddr; -extern int apic_cpuids[]; - -u_int apic_alloc_vector(u_int apic_id, u_int irq); -u_int apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, - u_int align); -void apic_disable_vector(u_int apic_id, u_int vector); -void apic_enable_vector(u_int apic_id, u_int vector); -void apic_free_vector(u_int apic_id, u_int vector, u_int irq); -u_int apic_idt_to_irq(u_int apic_id, u_int vector); -void apic_register_enumerator(struct apic_enumerator *enumerator); -u_int apic_cpuid(u_int apic_id); -void *ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase); -int ioapic_disable_pin(void *cookie, u_int pin); -int ioapic_get_vector(void *cookie, u_int pin); -void ioapic_register(void *cookie); -int ioapic_remap_vector(void *cookie, u_int pin, int vector); -int ioapic_set_bus(void *cookie, u_int pin, int bus_type); -int ioapic_set_extint(void *cookie, u_int pin); -int ioapic_set_nmi(void *cookie, u_int pin); -int ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol); -int ioapic_set_triggermode(void *cookie, u_int pin, - enum intr_trigger trigger); -int ioapic_set_smi(void *cookie, u_int pin); -void lapic_create(u_int apic_id, int boot_cpu); -void lapic_disable(void); -void lapic_disable_pmc(void); -void lapic_dump(const char *str); -void lapic_enable_cmc(void); -int lapic_enable_pmc(void); -void lapic_eoi(void); -int lapic_id(void); -void lapic_init(vm_paddr_t addr); -int lapic_intr_pending(u_int vector); -void lapic_ipi_raw(register_t icrlo, u_int dest); -void lapic_ipi_vectored(u_int vector, int dest); -int lapic_ipi_wait(int delay); -void lapic_handle_cmc(void); -void lapic_handle_error(void); -void lapic_handle_intr(int vector, struct trapframe *frame); -void lapic_handle_timer(struct trapframe *frame); -void lapic_reenable_pmc(void); -void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); -int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); -int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); -int lapic_set_lvt_polarity(u_int apic_id, u_int lvt, - enum intr_polarity pol); -int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, - enum intr_trigger trigger); -void lapic_set_tpr(u_int vector); -void lapic_setup(int boot); -void xen_intr_handle_upcall(struct trapframe *frame); - -#endif /* !LOCORE */ -#endif /* _MACHINE_APICVAR_H_ */ diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index d1b366b..2be7da1 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -22,7 +22,7 @@ #include <sys/bus.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/pcb.h> /* global symbols in mpboot.S */ diff --git a/sys/amd64/vmm/vmm_ipi.c b/sys/amd64/vmm/vmm_ipi.c index 1765284..aefa3ba 100644 --- a/sys/amd64/vmm/vmm_ipi.c +++ b/sys/amd64/vmm/vmm_ipi.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/segments.h> #include <machine/md_var.h> diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index b20ce4c..39f49e3 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/md_var.h> diff --git a/sys/dev/hwpmc/hwpmc_piv.c b/sys/dev/hwpmc/hwpmc_piv.c index 26b23a1..3137ea2 100644 --- a/sys/dev/hwpmc/hwpmc_piv.c +++ b/sys/dev/hwpmc/hwpmc_piv.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/cputypes.h> diff --git a/sys/dev/hwpmc/hwpmc_ppro.c b/sys/dev/hwpmc/hwpmc_ppro.c index 416a540..e99bb30 100644 --- a/sys/dev/hwpmc/hwpmc_ppro.c +++ b/sys/dev/hwpmc/hwpmc_ppro.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/cputypes.h> diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index b931fcc..d6ec5c3 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/specialreg.h> diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index f4c6c94..5c1194e 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/pmc_mdep.h> #include <machine/md_var.h> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index d43abbf..04ae7a1 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -143,7 +143,7 @@ __FBSDID("$FreeBSD$"); #endif #ifdef DEV_APIC -#include <machine/apicvar.h> +#include <x86/apicvar.h> #endif #ifdef DEV_ISA diff --git a/sys/i386/i386/mp_watchdog.c b/sys/i386/i386/mp_watchdog.c index 5cbd649..b1799a2 100644 --- a/sys/i386/i386/mp_watchdog.c +++ b/sys/i386/i386/mp_watchdog.c @@ -45,7 +45,7 @@ #include <machine/smp.h> #include <x86/apicreg.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/mp_watchdog.h> /* diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 64bf1a3..c19d6e6 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -140,7 +140,7 @@ __FBSDID("$FreeBSD$"); #ifdef DEV_APIC #include <sys/bus.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #endif #include <machine/cpu.h> #include <machine/cputypes.h> diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h index 43dad10..064c480 100644 --- a/sys/i386/include/smp.h +++ b/sys/i386/include/smp.h @@ -22,7 +22,7 @@ #include <sys/bus.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/pcb.h> /* global data in mpboot.s */ diff --git a/sys/i386/xen/mptable.c b/sys/i386/xen/mptable.c index 6682a8f..81d7c1b 100644 --- a/sys/i386/xen/mptable.c +++ b/sys/i386/xen/mptable.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <xen/hypervisor.h> #include <xen/xen-os.h> diff --git a/sys/pc98/include/apicvar.h b/sys/pc98/include/apicvar.h deleted file mode 100644 index 4f52d82..0000000 --- a/sys/pc98/include/apicvar.h +++ /dev/null @@ -1,6 +0,0 @@ -/*- - * This file is in the public domain. - */ -/* $FreeBSD$ */ - -#include <i386/apicvar.h> diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 0146cf3..730b0eb 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -137,7 +137,7 @@ __FBSDID("$FreeBSD$"); #endif #ifdef DEV_APIC -#include <machine/apicvar.h> +#include <x86/apicvar.h> #endif #ifdef DEV_ISA diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 5929fde..d0a333a 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <x86/apicreg.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <contrib/dev/acpica/include/acpi.h> #include <contrib/dev/acpica/include/actables.h> diff --git a/sys/x86/acpica/srat.c b/sys/x86/acpica/srat.c index 8b5082c..a275220 100644 --- a/sys/x86/acpica/srat.c +++ b/sys/x86/acpica/srat.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <contrib/dev/acpica/include/actables.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <dev/acpica/acpivar.h> diff --git a/sys/i386/include/apicvar.h b/sys/x86/include/apicvar.h index df99ebe..330d934 100644 --- a/sys/i386/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -29,8 +29,8 @@ * $FreeBSD$ */ -#ifndef _MACHINE_APICVAR_H_ -#define _MACHINE_APICVAR_H_ +#ifndef _X86_APICVAR_H_ +#define _X86_APICVAR_H_ /* * Local && I/O APIC variable definitions. @@ -114,14 +114,16 @@ #define IPI_INVLPG (APIC_IPI_INTS + 2) #define IPI_INVLRNG (APIC_IPI_INTS + 3) #define IPI_INVLCACHE (APIC_IPI_INTS + 4) +#ifdef __i386__ #define IPI_LAZYPMAP (APIC_IPI_INTS + 5) /* Lazy pmap release. */ +#endif /* Vector to handle bitmap based IPIs */ #define IPI_BITMAP_VECTOR (APIC_IPI_INTS + 6) -/* IPIs handled by IPI_BITMAPED_VECTOR (XXX ups is there a better place?) */ +/* IPIs handled by IPI_BITMAP_VECTOR */ #define IPI_AST 0 /* Generate software trap. */ #define IPI_PREEMPT 1 -#define IPI_HARDCLOCK 2 +#define IPI_HARDCLOCK 2 #define IPI_BITMAP_LAST IPI_HARDCLOCK #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) @@ -220,4 +222,4 @@ void lapic_setup(int boot); void xen_intr_handle_upcall(struct trapframe *frame); #endif /* !LOCORE */ -#endif /* _MACHINE_APICVAR_H_ */ +#endif /* _X86_APICVAR_H_ */ diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 6d62b1e..8501ad9 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <x86/apicreg.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/resource.h> #include <machine/segments.h> diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 41bd602..c1be18f 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include <machine/cputypes.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <x86/mca.h> #include <machine/md_var.h> #include <machine/smp.h> diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index deb8b96..0e246ed 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/taskqueue.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/cpu.h> #include <machine/cputypes.h> #include <x86/mca.h> diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index 33493e0..b0e42a9 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <x86/mptable.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/md_var.h> #ifdef NEW_PCIB #include <machine/resource.h> diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 381f097..2d3a202 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/frame.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/specialreg.h> #include <dev/pci/pcivar.h> diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index fd36e68..18f88c2 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/intr_machdep.h> -#include <machine/apicvar.h> +#include <x86/apicvar.h> #include <machine/smp.h> #include <machine/stdarg.h> |