diff options
45 files changed, 54 insertions, 54 deletions
diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/include/asm/ipi.h index 5f2efc5..3395c68 100644 --- a/arch/x86/include/asm/ipi.h +++ b/arch/x86/include/asm/ipi.h @@ -123,7 +123,7 @@ extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, int vector); extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask, int vector); -#include <asm/genapic.h> +#include <asm/apic.h> extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask, int vector); diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 956c1de..4281415 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -37,7 +37,7 @@ #include <asm/pgtable.h> #include <asm/io_apic.h> #include <asm/apic.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/io.h> #include <asm/mpspec.h> #include <asm/smp.h> diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index af494ba..7db03a9 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -36,7 +36,7 @@ #include <asm/arch_hooks.h> #include <asm/pgalloc.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/atomic.h> #include <asm/mpspec.h> #include <asm/i8253.h> diff --git a/arch/x86/kernel/bigsmp_32.c b/arch/x86/kernel/bigsmp_32.c index 9eeb714..72f4e53 100644 --- a/arch/x86/kernel/bigsmp_32.c +++ b/arch/x86/kernel/bigsmp_32.c @@ -6,7 +6,7 @@ #include <linux/threads.h> #include <linux/cpumask.h> #include <asm/mpspec.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <asm/ipi.h> diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index e48640c..6882a73 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c @@ -7,7 +7,7 @@ #include <asm/pat.h> #include <asm/processor.h> -#include <asm/genapic.h> +#include <asm/apic.h> struct cpuid_bit { u16 feature; diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index ff4d7b9..c94ba93 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -12,7 +12,7 @@ # include <asm/cacheflush.h> #endif -#include <asm/genapic.h> +#include <asm/apic.h> #include "cpu.h" diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 4b5d13e..41f3788 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -26,8 +26,8 @@ #ifdef CONFIG_X86_LOCAL_APIC #include <asm/mpspec.h> #include <asm/apic.h> -#include <asm/genapic.h> -#include <asm/genapic.h> +#include <asm/apic.h> +#include <asm/apic.h> #include <asm/uv/uv.h> #endif diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 1f137a8..290f92e 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -24,7 +24,7 @@ #ifdef CONFIG_X86_LOCAL_APIC #include <asm/mpspec.h> #include <asm/apic.h> -#include <asm/genapic.h> +#include <asm/apic.h> #endif static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index e22d6ed..4772e91 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c @@ -24,7 +24,7 @@ #include <linux/smp.h> #include <linux/sysdev.h> #include <linux/sysfs.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/mce.h> #include <asm/msr.h> #include <asm/percpu.h> diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c index 42f0907..5e8c79e 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c @@ -7,7 +7,7 @@ #include <linux/interrupt.h> #include <linux/percpu.h> #include <asm/processor.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/msr.h> #include <asm/mce.h> #include <asm/hw_irq.h> diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c index f9c92b6..9b60fce 100644 --- a/arch/x86/kernel/cpu/mcheck/p4.c +++ b/arch/x86/kernel/cpu/mcheck/p4.c @@ -11,7 +11,7 @@ #include <asm/processor.h> #include <asm/system.h> #include <asm/msr.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/therm_throt.h> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index ad7f2a6..3340cc0 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -28,7 +28,7 @@ #include <asm/reboot.h> #include <asm/virtext.h> -#include <asm/genapic.h> +#include <asm/apic.h> #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c index 23f1df4..6cdfb3e4 100644 --- a/arch/x86/kernel/es7000_32.c +++ b/arch/x86/kernel/es7000_32.c @@ -40,7 +40,7 @@ #include <asm/smp.h> #include <asm/atomic.h> #include <asm/apicdef.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/setup.h> /* @@ -387,7 +387,7 @@ void __init es7000_enable_apic_mode(void) #include <linux/threads.h> #include <linux/cpumask.h> #include <asm/mpspec.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <linux/kernel.h> diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c index ef78863..91cae6f 100644 --- a/arch/x86/kernel/genapic_64.c +++ b/arch/x86/kernel/genapic_64.c @@ -19,7 +19,7 @@ #include <linux/dmar.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/ipi.h> #include <asm/setup.h> diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index 36ee760..a7d8476 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c @@ -17,7 +17,7 @@ #include <linux/init.h> #include <linux/hardirq.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/ipi.h> #ifdef CONFIG_ACPI diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c index dd6e8d6..f5e02cf 100644 --- a/arch/x86/kernel/genx2apic_cluster.c +++ b/arch/x86/kernel/genx2apic_cluster.c @@ -7,7 +7,7 @@ #include <linux/dmar.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/ipi.h> DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid); diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index eb1486b..11eb4cb 100644 --- a/arch/x86/kernel/genx2apic_phys.c +++ b/arch/x86/kernel/genx2apic_phys.c @@ -7,7 +7,7 @@ #include <linux/dmar.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/ipi.h> static int x2apic_phys; diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c index 9ae4a92..c1746a1 100644 --- a/arch/x86/kernel/genx2apic_uv_x.c +++ b/arch/x86/kernel/genx2apic_uv_x.c @@ -22,7 +22,7 @@ #include <linux/proc_fs.h> #include <asm/current.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/ipi.h> #include <asm/pgtable.h> #include <asm/uv/uv.h> diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index a89878e..00e6071 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c @@ -62,7 +62,7 @@ #include <asm/uv/uv_hub.h> #include <asm/uv/uv_irq.h> -#include <asm/genapic.h> +#include <asm/apic.h> #define __apicdebuginit(type) static type __init diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c index 1326272..dbf5445 100644 --- a/arch/x86/kernel/ipi.c +++ b/arch/x86/kernel/ipi.c @@ -15,7 +15,7 @@ #include <asm/mtrr.h> #include <asm/tlbflush.h> #include <asm/mmu_context.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/proto.h> #include <asm/ipi.h> diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 3957776..f13ca16 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -8,7 +8,7 @@ #include <linux/smp.h> #include <linux/ftrace.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/io_apic.h> #include <asm/irq.h> #include <asm/idle.h> diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 4beb9a1..e4ac7c8 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -212,7 +212,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs) } #ifdef CONFIG_HOTPLUG_CPU -#include <asm/genapic.h> +#include <asm/apic.h> /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ void fixup_irqs(void) diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 5c4f554..eedfaeb 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -46,7 +46,7 @@ #include <asm/apicdef.h> #include <asm/system.h> -#include <asm/genapic.h> +#include <asm/apic.h> /* * Put the error code here just in case the user cares: diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 20076445..7f4d258 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -29,7 +29,7 @@ #include <asm/setup.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> /* * Checksum an MP configuration block. */ diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 48b9ca5..bdfad80 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -11,7 +11,7 @@ * Mikael Pettersson : PM converted to driver model. Disable/enable API. */ -#include <asm/genapic.h> +#include <asm/apic.h> #include <linux/nmi.h> #include <linux/mm.h> diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index f0f0c2f..5a2d75d 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c @@ -31,7 +31,7 @@ #include <asm/processor.h> #include <asm/topology.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/numaq.h> #include <asm/setup.h> #include <asm/e820.h> @@ -301,7 +301,7 @@ int __init get_memcfg_numaq(void) #include <linux/threads.h> #include <linux/cpumask.h> #include <asm/mpspec.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <asm/ipi.h> diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c index b3d5d74..be0d554 100644 --- a/arch/x86/kernel/probe_32.c +++ b/arch/x86/kernel/probe_32.c @@ -17,20 +17,20 @@ #include <asm/fixmap.h> #include <asm/mpspec.h> #include <asm/apicdef.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/setup.h> #include <linux/threads.h> #include <linux/cpumask.h> #include <asm/mpspec.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <linux/kernel.h> #include <linux/string.h> #include <linux/smp.h> #include <linux/init.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/ipi.h> #include <linux/smp.h> @@ -41,7 +41,7 @@ #include <asm/e820.h> #include <asm/setup.h> -#include <asm/genapic.h> +#include <asm/apic.h> #ifdef CONFIG_HOTPLUG_CPU #define DEFAULT_SEND_IPI (1) diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 32e8f0a..7c8cd44 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -24,7 +24,7 @@ # include <asm/iommu.h> #endif -#include <asm/genapic.h> +#include <asm/apic.h> /* * Power off function, if any diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 43d9644..deaafd2 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -97,7 +97,7 @@ #include <asm/mmu_context.h> #include <asm/proto.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/paravirt.h> #include <asm/hypervisor.h> diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index eaaffae..13f33ea 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -26,7 +26,7 @@ #include <asm/tlbflush.h> #include <asm/mmu_context.h> #include <asm/proto.h> -#include <asm/genapic.h> +#include <asm/apic.h> /* * Some notes on x86 processor bugs affecting SMP operation: * diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index b5f2b69..562a9fc 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -60,12 +60,12 @@ #include <asm/tlbflush.h> #include <asm/mtrr.h> #include <asm/vmi.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/setup.h> #include <asm/uv/uv.h> #include <linux/mc146818rtc.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/smpboot_hooks.h> #ifdef CONFIG_X86_32 diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c index 1cf32c3..eb31ba2 100644 --- a/arch/x86/kernel/summit_32.c +++ b/arch/x86/kernel/summit_32.c @@ -40,7 +40,7 @@ #include <asm/mpspec.h> #include <asm/apic.h> #include <asm/smp.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/fixmap.h> #include <asm/apicdef.h> #include <asm/ipi.h> diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index f396e61..1a7dfa7 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c @@ -15,12 +15,12 @@ #include <asm/uv/uv_mmrs.h> #include <asm/uv/uv_hub.h> #include <asm/uv/uv_bau.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/idle.h> #include <asm/tsc.h> #include <asm/irq_vectors.h> -#include <asm/genapic.h> +#include <asm/apic.h> static struct bau_control **uv_bau_table_bases __read_mostly; static int uv_bau_retry_limit __read_mostly; diff --git a/arch/x86/kernel/uv_irq.c b/arch/x86/kernel/uv_irq.c index 75eb5ec..aeef529 100644 --- a/arch/x86/kernel/uv_irq.c +++ b/arch/x86/kernel/uv_irq.c @@ -11,7 +11,7 @@ #include <linux/module.h> #include <linux/irq.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/uv/uv_irq.h> static void uv_noop(unsigned int irq) diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c index 4fd646e..5264fea 100644 --- a/arch/x86/kernel/visws_quirks.c +++ b/arch/x86/kernel/visws_quirks.c @@ -32,9 +32,9 @@ #include <asm/e820.h> #include <asm/io.h> -#include <asm/genapic.h> +#include <asm/apic.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <linux/kernel_stat.h> diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index a1c7b71..2cc4a90 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <asm/fixmap.h> #include <asm/apicdef.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/processor.h> #include <asm/timer.h> #include <asm/vmi_time.h> diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index 2a5e0e6..a4791ef 100644 --- a/arch/x86/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c @@ -30,7 +30,7 @@ #include <asm/vmi_time.h> #include <asm/arch_hooks.h> #include <asm/apicdef.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/timer.h> #include <asm/i8253.h> #include <asm/irq_vectors.h> diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index bc9893f..f3a5305 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -55,7 +55,7 @@ #include <linux/lguest_launcher.h> #include <linux/virtio_console.h> #include <linux/pm.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/lguest.h> #include <asm/paravirt.h> #include <asm/param.h> diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 15df1bae..574c8bc 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -20,7 +20,7 @@ #include <asm/proto.h> #include <asm/numa.h> #include <asm/e820.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/uv/uv.h> int acpi_numa __initdata; diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 14c5af4..b641349 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -14,7 +14,7 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) = { &init_mm, 0, }; -#include <asm/genapic.h> +#include <asm/apic.h> /* * Smarter SMP flushing macros. * c/o Linus Torvalds. diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index a32a5c7..202864a 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -19,7 +19,7 @@ #include <linux/cpu.h> #include <asm/nmi.h> #include <asm/msr.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include "op_counter.h" #include "op_x86_model.h" diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c index 09a237b..4c4a51c 100644 --- a/arch/x86/oprofile/op_model_p4.c +++ b/arch/x86/oprofile/op_model_p4.c @@ -14,7 +14,7 @@ #include <linux/nmi.h> #include <asm/msr.h> #include <asm/fixmap.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include "op_x86_model.h" diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 5ebd8f6..e9f80c7 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <asm/ptrace.h> #include <asm/msr.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/nmi.h> #include <asm/intel_arch_perfmon.h> diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c index 5601e82..8eb295e 100644 --- a/arch/x86/pci/numaq_32.c +++ b/arch/x86/pci/numaq_32.c @@ -5,7 +5,7 @@ #include <linux/pci.h> #include <linux/init.h> #include <linux/nodemask.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/mpspec.h> #include <asm/pci_x86.h> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index e3dd3fb..86497d5 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -36,7 +36,7 @@ #include <xen/hvc-console.h> #include <asm/paravirt.h> -#include <asm/genapic.h> +#include <asm/apic.h> #include <asm/page.h> #include <asm/xen/hypercall.h> #include <asm/xen/hypervisor.h> |
