Date: Mon, 1 Nov 2010 18:18:46 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r214631 - in head/sys: amd64/acpica amd64/amd64 amd64/include i386/acpica i386/i386 i386/include i386/xen pc98/include x86/include x86/x86 Message-ID: <201011011818.oA1IIkQt079688@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Mon Nov 1 18:18:46 2010 New Revision: 214631 URL: http://svn.freebsd.org/changeset/base/214631 Log: Move <machine/apicreg.h> to <x86/apicreg.h>. Added: head/sys/x86/include/apicreg.h - copied, changed from r214624, head/sys/i386/include/apicreg.h Deleted: head/sys/amd64/include/apicreg.h head/sys/i386/include/apicreg.h head/sys/pc98/include/apicreg.h Modified: head/sys/amd64/acpica/acpi_wakeup.c head/sys/amd64/acpica/madt.c head/sys/amd64/amd64/apic_vector.S head/sys/amd64/amd64/genassym.c head/sys/amd64/amd64/mp_machdep.c head/sys/amd64/amd64/mp_watchdog.c head/sys/i386/acpica/madt.c head/sys/i386/i386/apic_vector.s head/sys/i386/i386/genassym.c head/sys/i386/i386/mp_machdep.c head/sys/i386/i386/mp_watchdog.c head/sys/i386/i386/mpboot.s head/sys/i386/xen/mp_machdep.c head/sys/i386/xen/mptable.c head/sys/x86/x86/io_apic.c head/sys/x86/x86/local_apic.c head/sys/x86/x86/mptable.c head/sys/x86/x86/msi.c Modified: head/sys/amd64/acpica/acpi_wakeup.c ============================================================================== --- head/sys/amd64/acpica/acpi_wakeup.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/amd64/acpica/acpi_wakeup.c Mon Nov 1 18:18:46 2010 (r214631) @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include <machine/specialreg.h> #ifdef SMP -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/smp.h> #include <machine/vmparam.h> #endif Modified: head/sys/amd64/acpica/madt.c ============================================================================== --- head/sys/amd64/acpica/madt.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/amd64/acpica/madt.c Mon Nov 1 18:18:46 2010 (r214631) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/intr_machdep.h> #include <machine/apicvar.h> Modified: head/sys/amd64/amd64/apic_vector.S ============================================================================== --- head/sys/amd64/amd64/apic_vector.S Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/amd64/amd64/apic_vector.S Mon Nov 1 18:18:46 2010 (r214631) @@ -39,7 +39,7 @@ #include "opt_smp.h" #include <machine/asmacros.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include "assym.s" Modified: head/sys/amd64/amd64/genassym.c ============================================================================== --- head/sys/amd64/amd64/genassym.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/amd64/amd64/genassym.c Mon Nov 1 18:18:46 2010 (r214631) @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include <nfs/nfsproto.h> #include <nfsclient/nfs.h> #include <nfsclient/nfsdiskless.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/cpu.h> #include <machine/pcb.h> #include <machine/sigframe.h> Modified: head/sys/amd64/amd64/mp_machdep.c ============================================================================== --- head/sys/amd64/amd64/mp_machdep.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/amd64/amd64/mp_machdep.c Mon Nov 1 18:18:46 2010 (r214631) @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_kern.h> #include <vm/vm_extern.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/clock.h> #include <machine/cputypes.h> #include <machine/cpufunc.h> Modified: head/sys/amd64/amd64/mp_watchdog.c ============================================================================== --- head/sys/amd64/amd64/mp_watchdog.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/amd64/amd64/mp_watchdog.c Mon Nov 1 18:18:46 2010 (r214631) @@ -44,7 +44,7 @@ #include <sys/systm.h> #include <machine/smp.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/apicvar.h> #include <machine/mp_watchdog.h> Modified: head/sys/i386/acpica/madt.c ============================================================================== --- head/sys/i386/acpica/madt.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/acpica/madt.c Mon Nov 1 18:18:46 2010 (r214631) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/intr_machdep.h> #include <machine/apicvar.h> Modified: head/sys/i386/i386/apic_vector.s ============================================================================== --- head/sys/i386/i386/apic_vector.s Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/i386/apic_vector.s Mon Nov 1 18:18:46 2010 (r214631) @@ -39,7 +39,7 @@ #include "opt_smp.h" #include <machine/asmacros.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include "assym.s" Modified: head/sys/i386/i386/genassym.c ============================================================================== --- head/sys/i386/i386/genassym.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/i386/genassym.c Mon Nov 1 18:18:46 2010 (r214631) @@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$"); #include <nfsclient/nfs.h> #include <nfsclient/nfsdiskless.h> #ifdef DEV_APIC -#include <machine/apicreg.h> +#include <x86/apicreg.h> #endif #include <machine/cpu.h> #include <machine/pcb.h> Modified: head/sys/i386/i386/mp_machdep.c ============================================================================== --- head/sys/i386/i386/mp_machdep.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/i386/mp_machdep.c Mon Nov 1 18:18:46 2010 (r214631) @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_kern.h> #include <vm/vm_extern.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/clock.h> #include <machine/cputypes.h> #include <x86/mca.h> Modified: head/sys/i386/i386/mp_watchdog.c ============================================================================== --- head/sys/i386/i386/mp_watchdog.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/i386/mp_watchdog.c Mon Nov 1 18:18:46 2010 (r214631) @@ -44,7 +44,7 @@ #include <sys/systm.h> #include <machine/smp.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/apicvar.h> #include <machine/mp_watchdog.h> Modified: head/sys/i386/i386/mpboot.s ============================================================================== --- head/sys/i386/i386/mpboot.s Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/i386/mpboot.s Mon Nov 1 18:18:46 2010 (r214631) @@ -32,7 +32,7 @@ #include "opt_pmap.h" #include <machine/asmacros.h> /* miscellaneous asm macros */ -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/specialreg.h> #include "assym.s" Modified: head/sys/i386/xen/mp_machdep.c ============================================================================== --- head/sys/i386/xen/mp_machdep.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/xen/mp_machdep.c Mon Nov 1 18:18:46 2010 (r214631) @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_page.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/md_var.h> #include <machine/mp_watchdog.h> #include <machine/pcb.h> Modified: head/sys/i386/xen/mptable.c ============================================================================== --- head/sys/i386/xen/mptable.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/i386/xen/mptable.c Mon Nov 1 18:18:46 2010 (r214631) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/frame.h> #include <machine/intr_machdep.h> #include <machine/apicvar.h> Copied and modified: head/sys/x86/include/apicreg.h (from r214624, head/sys/i386/include/apicreg.h) ============================================================================== --- head/sys/i386/include/apicreg.h Mon Nov 1 11:38:04 2010 (r214624, copy source) +++ head/sys/x86/include/apicreg.h Mon Nov 1 18:18:46 2010 (r214631) @@ -25,8 +25,8 @@ * $FreeBSD$ */ -#ifndef _MACHINE_APICREG_H_ -#define _MACHINE_APICREG_H_ +#ifndef _X86_APICREG_H_ +#define _X86_APICREG_H_ /* * Local && I/O APIC definitions. @@ -442,4 +442,4 @@ typedef struct IOAPIC ioapic_t; #define IOART_INTVEC 0x000000ff /* R/W: INTerrupt vector field */ -#endif /* _MACHINE_APICREG_H_ */ +#endif /* _X86_APICREG_H_ */ Modified: head/sys/x86/x86/io_apic.c ============================================================================== --- head/sys/x86/x86/io_apic.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/x86/x86/io_apic.c Mon Nov 1 18:18:46 2010 (r214631) @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/frame.h> #include <machine/intr_machdep.h> #include <machine/apicvar.h> Modified: head/sys/x86/x86/local_apic.c ============================================================================== --- head/sys/x86/x86/local_apic.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/x86/x86/local_apic.c Mon Nov 1 18:18:46 2010 (r214631) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/frame.h> Modified: head/sys/x86/x86/mptable.c ============================================================================== --- head/sys/x86/x86/mptable.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/x86/x86/mptable.c Mon Nov 1 18:18:46 2010 (r214631) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/frame.h> #include <machine/intr_machdep.h> #include <machine/apicvar.h> Modified: head/sys/x86/x86/msi.c ============================================================================== --- head/sys/x86/x86/msi.c Mon Nov 1 17:40:35 2010 (r214630) +++ head/sys/x86/x86/msi.c Mon Nov 1 18:18:46 2010 (r214631) @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/sx.h> #include <sys/systm.h> -#include <machine/apicreg.h> +#include <x86/apicreg.h> #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/frame.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011011818.oA1IIkQt079688>