x86, apic: remove duplicate asm/apic.h inclusions
Impact: cleanup Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
7b6aa335ca
commit
e641f5f525
@ -123,8 +123,6 @@ extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,
|
|||||||
int vector);
|
int vector);
|
||||||
extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
|
extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
|
||||||
int vector);
|
int vector);
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
|
extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
|
||||||
int vector);
|
int vector);
|
||||||
extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
|
extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
|
||||||
|
@ -37,7 +37,6 @@
|
|||||||
#include <asm/pgtable.h>
|
#include <asm/pgtable.h>
|
||||||
#include <asm/io_apic.h>
|
#include <asm/io_apic.h>
|
||||||
#include <asm/apic.h>
|
#include <asm/apic.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/smp.h>
|
#include <asm/smp.h>
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
|
|
||||||
#include <asm/arch_hooks.h>
|
#include <asm/arch_hooks.h>
|
||||||
#include <asm/pgalloc.h>
|
#include <asm/pgalloc.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/i8253.h>
|
#include <asm/i8253.h>
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
# include <asm/cacheflush.h>
|
# include <asm/cacheflush.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
|
@ -23,11 +23,9 @@
|
|||||||
#include <asm/smp.h>
|
#include <asm/smp.h>
|
||||||
#include <asm/cpu.h>
|
#include <asm/cpu.h>
|
||||||
#include <asm/cpumask.h>
|
#include <asm/cpumask.h>
|
||||||
|
#include <asm/apic.h>
|
||||||
|
|
||||||
#ifdef CONFIG_X86_LOCAL_APIC
|
#ifdef CONFIG_X86_LOCAL_APIC
|
||||||
#include <asm/mpspec.h>
|
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/uv/uv.h>
|
#include <asm/uv/uv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
#ifdef CONFIG_X86_LOCAL_APIC
|
#ifdef CONFIG_X86_LOCAL_APIC
|
||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/apic.h>
|
#include <asm/apic.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
|
static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
|
||||||
|
@ -28,8 +28,6 @@
|
|||||||
#include <asm/reboot.h>
|
#include <asm/reboot.h>
|
||||||
#include <asm/virtext.h>
|
#include <asm/virtext.h>
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
|
#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
|
||||||
|
|
||||||
|
@ -387,7 +387,6 @@ void __init es7000_enable_apic_mode(void)
|
|||||||
#include <linux/threads.h>
|
#include <linux/threads.h>
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/fixmap.h>
|
#include <asm/fixmap.h>
|
||||||
#include <asm/apicdef.h>
|
#include <asm/apicdef.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
@ -212,7 +212,6 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
/* A cpu has been removed from cpu_online_mask. Reset irq affinities. */
|
/* A cpu has been removed from cpu_online_mask. Reset irq affinities. */
|
||||||
void fixup_irqs(void)
|
void fixup_irqs(void)
|
||||||
|
@ -301,7 +301,6 @@ int __init get_memcfg_numaq(void)
|
|||||||
#include <linux/threads.h>
|
#include <linux/threads.h>
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/fixmap.h>
|
#include <asm/fixmap.h>
|
||||||
#include <asm/apicdef.h>
|
#include <asm/apicdef.h>
|
||||||
#include <asm/ipi.h>
|
#include <asm/ipi.h>
|
||||||
|
@ -23,14 +23,12 @@
|
|||||||
#include <linux/threads.h>
|
#include <linux/threads.h>
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/fixmap.h>
|
#include <asm/fixmap.h>
|
||||||
#include <asm/apicdef.h>
|
#include <asm/apicdef.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/ipi.h>
|
#include <asm/ipi.h>
|
||||||
|
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
@ -41,8 +39,6 @@
|
|||||||
#include <asm/e820.h>
|
#include <asm/e820.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
#define DEFAULT_SEND_IPI (1)
|
#define DEFAULT_SEND_IPI (1)
|
||||||
#else
|
#else
|
||||||
|
@ -24,8 +24,6 @@
|
|||||||
# include <asm/iommu.h>
|
# include <asm/iommu.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Power off function, if any
|
* Power off function, if any
|
||||||
*/
|
*/
|
||||||
|
@ -97,7 +97,6 @@
|
|||||||
#include <asm/mmu_context.h>
|
#include <asm/mmu_context.h>
|
||||||
#include <asm/proto.h>
|
#include <asm/proto.h>
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/paravirt.h>
|
#include <asm/paravirt.h>
|
||||||
#include <asm/hypervisor.h>
|
#include <asm/hypervisor.h>
|
||||||
|
|
||||||
|
@ -65,7 +65,6 @@
|
|||||||
#include <asm/uv/uv.h>
|
#include <asm/uv/uv.h>
|
||||||
#include <linux/mc146818rtc.h>
|
#include <linux/mc146818rtc.h>
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/smpboot_hooks.h>
|
#include <asm/smpboot_hooks.h>
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
|
@ -40,7 +40,6 @@
|
|||||||
#include <asm/mpspec.h>
|
#include <asm/mpspec.h>
|
||||||
#include <asm/apic.h>
|
#include <asm/apic.h>
|
||||||
#include <asm/smp.h>
|
#include <asm/smp.h>
|
||||||
#include <asm/apic.h>
|
|
||||||
#include <asm/fixmap.h>
|
#include <asm/fixmap.h>
|
||||||
#include <asm/apicdef.h>
|
#include <asm/apicdef.h>
|
||||||
#include <asm/ipi.h>
|
#include <asm/ipi.h>
|
||||||
|
@ -20,8 +20,6 @@
|
|||||||
#include <asm/tsc.h>
|
#include <asm/tsc.h>
|
||||||
#include <asm/irq_vectors.h>
|
#include <asm/irq_vectors.h>
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
static struct bau_control **uv_bau_table_bases __read_mostly;
|
static struct bau_control **uv_bau_table_bases __read_mostly;
|
||||||
static int uv_bau_retry_limit __read_mostly;
|
static int uv_bau_retry_limit __read_mostly;
|
||||||
|
|
||||||
|
@ -29,13 +29,10 @@
|
|||||||
#include <asm/fixmap.h>
|
#include <asm/fixmap.h>
|
||||||
#include <asm/reboot.h>
|
#include <asm/reboot.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
#include <asm/apic.h>
|
||||||
#include <asm/e820.h>
|
#include <asm/e820.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
#include <linux/kernel_stat.h>
|
#include <linux/kernel_stat.h>
|
||||||
|
|
||||||
#include <asm/i8259.h>
|
#include <asm/i8259.h>
|
||||||
@ -49,8 +46,6 @@
|
|||||||
|
|
||||||
extern int no_broadcast;
|
extern int no_broadcast;
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
|
|
||||||
char visws_board_type = -1;
|
char visws_board_type = -1;
|
||||||
char visws_board_rev = -1;
|
char visws_board_rev = -1;
|
||||||
|
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate)
|
DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate)
|
||||||
= { &init_mm, 0, };
|
= { &init_mm, 0, };
|
||||||
|
|
||||||
#include <asm/apic.h>
|
|
||||||
/*
|
/*
|
||||||
* Smarter SMP flushing macros.
|
* Smarter SMP flushing macros.
|
||||||
* c/o Linus Torvalds.
|
* c/o Linus Torvalds.
|
||||||
|
Loading…
Reference in New Issue
Block a user