Author: jhb
Date: Thu Jan 23 20:10:22 2014
New Revision: 261087
URL: http://svnweb.freebsd.org/changeset/base/261087
Log:
Move <machine/apicvar.h> to <x86/apicvar.h>.
Added:
head/sys/x86/include/apicvar.h
- copied, changed from r260983, head/sys/i386/include/apicvar.h
Deleted:
head/sys/amd64/include/apicvar.h
head/sys/i386/include/apicvar.h
head/sys/pc98/include/apicvar.h
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/amd64/amd64/mp_watchdog.c
head/sys/amd64/amd64/pmap.c
head/sys/amd64/include/smp.h
head/sys/amd64/vmm/vmm_ipi.c
head/sys/dev/hwpmc/hwpmc_core.c
head/sys/dev/hwpmc/hwpmc_piv.c
head/sys/dev/hwpmc/hwpmc_ppro.c
head/sys/dev/hwpmc/hwpmc_uncore.c
head/sys/dev/hwpmc/hwpmc_x86.c
head/sys/i386/i386/machdep.c
head/sys/i386/i386/mp_watchdog.c
head/sys/i386/i386/pmap.c
head/sys/i386/include/smp.h
head/sys/i386/xen/mptable.c
head/sys/pc98/pc98/machdep.c
head/sys/x86/acpica/madt.c
head/sys/x86/acpica/srat.c
head/sys/x86/x86/io_apic.c
head/sys/x86/x86/local_apic.c
head/sys/x86/x86/mca.c
head/sys/x86/x86/mptable.c
head/sys/x86/x86/msi.c
head/sys/x86/xen/xen_intr.c
Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/amd64/amd64/machdep.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/amd64/amd64/mp_watchdog.c
==============================================================================
--- head/sys/amd64/amd64/mp_watchdog.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/amd64/amd64/mp_watchdog.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
/*
Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/amd64/amd64/pmap.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/amd64/include/smp.h
==============================================================================
--- head/sys/amd64/include/smp.h Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/amd64/include/smp.h Thu Jan 23 20:10:22 2014
(r261087)
@@ -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 */
Modified: head/sys/amd64/vmm/vmm_ipi.c
==============================================================================
--- head/sys/amd64/vmm/vmm_ipi.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/amd64/vmm/vmm_ipi.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_core.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/dev/hwpmc/hwpmc_core.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/dev/hwpmc/hwpmc_piv.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_piv.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/dev/hwpmc/hwpmc_piv.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/dev/hwpmc/hwpmc_ppro.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_ppro.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/dev/hwpmc/hwpmc_ppro.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/dev/hwpmc/hwpmc_uncore.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_uncore.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/dev/hwpmc/hwpmc_uncore.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/dev/hwpmc/hwpmc_x86.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_x86.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/dev/hwpmc/hwpmc_x86.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/i386/i386/machdep.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -143,7 +143,7 @@ __FBSDID("$FreeBSD$");
#endif
#ifdef DEV_APIC
-#include <machine/apicvar.h>
+#include <x86/apicvar.h>
#endif
#ifdef DEV_ISA
Modified: head/sys/i386/i386/mp_watchdog.c
==============================================================================
--- head/sys/i386/i386/mp_watchdog.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/i386/i386/mp_watchdog.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
/*
Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/i386/i386/pmap.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/i386/include/smp.h
==============================================================================
--- head/sys/i386/include/smp.h Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/i386/include/smp.h Thu Jan 23 20:10:22 2014 (r261087)
@@ -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 */
Modified: head/sys/i386/xen/mptable.c
==============================================================================
--- head/sys/i386/xen/mptable.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/i386/xen/mptable.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/pc98/pc98/machdep.c
==============================================================================
--- head/sys/pc98/pc98/machdep.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/pc98/pc98/machdep.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -137,7 +137,7 @@ __FBSDID("$FreeBSD$");
#endif
#ifdef DEV_APIC
-#include <machine/apicvar.h>
+#include <x86/apicvar.h>
#endif
#ifdef DEV_ISA
Modified: head/sys/x86/acpica/madt.c
==============================================================================
--- head/sys/x86/acpica/madt.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/acpica/madt.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/x86/acpica/srat.c
==============================================================================
--- head/sys/x86/acpica/srat.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/acpica/srat.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Copied and modified: head/sys/x86/include/apicvar.h (from r260983,
head/sys/i386/include/apicvar.h)
==============================================================================
--- head/sys/i386/include/apicvar.h Tue Jan 21 13:23:18 2014
(r260983, copy source)
+++ head/sys/x86/include/apicvar.h Thu Jan 23 20:10:22 2014
(r261087)
@@ -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_ */
Modified: head/sys/x86/x86/io_apic.c
==============================================================================
--- head/sys/x86/x86/io_apic.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/x86/io_apic.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c Thu Jan 23 19:55:02 2014
(r261086)
+++ head/sys/x86/x86/local_apic.c Thu Jan 23 20:10:22 2014
(r261087)
@@ -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>
Modified: head/sys/x86/x86/mca.c
==============================================================================
--- head/sys/x86/x86/mca.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/x86/mca.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/x86/x86/mptable.c
==============================================================================
--- head/sys/x86/x86/mptable.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/x86/mptable.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/x86/x86/msi.c
==============================================================================
--- head/sys/x86/x86/msi.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/x86/msi.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
Modified: head/sys/x86/xen/xen_intr.c
==============================================================================
--- head/sys/x86/xen/xen_intr.c Thu Jan 23 19:55:02 2014 (r261086)
+++ head/sys/x86/xen/xen_intr.c Thu Jan 23 20:10:22 2014 (r261087)
@@ -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>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
