x86, apic: remove duplicate asm/apic.h inclusions

Impact: cleanup

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/include/asm/ipi.h
index 3395c680a9767f5323f171c2607bbece242dda07..0b7228268a63e1d9bfacc13aca04c664e8297b1d 100644 (file)
--- a/arch/x86/include/asm/ipi.h
+++ b/arch/x86/include/asm/ipi.h
@@ -123,8 +123,6 @@ 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/apic.h>
-
 extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
                                                         int vector);
 extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 42814152c940fdb5b73993118ba139a6ace25041..a18eb7ce223643c8c9d6f40303c8180fa7d59e47 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -37,7 +37,6 @@
 #include <asm/pgtable.h>
 #include <asm/io_apic.h>
 #include <asm/apic.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 7db03a9b61dcbbf11b4554213bc0b2b21fe7594e..c12823eb55b5974f7facdd040f33c741a8bdad77 100644 (file)
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -36,7 +36,6 @@
 
 #include <asm/arch_hooks.h>
 #include <asm/pgalloc.h>
-#include <asm/apic.h>
 #include <asm/atomic.h>
 #include <asm/mpspec.h>
 #include <asm/i8253.h>

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index c94ba9311e6570febcab9708bcee284149b7dc0e..25423a5b80ed28a7058bd01cf3f5f0358fb167b4 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -12,8 +12,6 @@
 # include <asm/cacheflush.h>
 #endif
 
-#include <asm/apic.h>
-
 #include "cpu.h"
 
 #ifdef CONFIG_X86_32

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 41f3788ec9b9486c351ead9bdd7205b4431ae3f2..826d5c87627826911ac393f215c0cecb03f50ef9 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -23,11 +23,9 @@
 #include <asm/smp.h>
 #include <asm/cpu.h>
 #include <asm/cpumask.h>
-#ifdef CONFIG_X86_LOCAL_APIC
-#include <asm/mpspec.h>
-#include <asm/apic.h>
-#include <asm/apic.h>
 #include <asm/apic.h>
+
+#ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/uv/uv.h>
 #endif
 

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 290f92e2b7c6057f93f650ca4e792c461f3d710f..7aeef1d327b17ddcce8781aad495535c2e5e688e 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -24,7 +24,6 @@
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/mpspec.h>
 #include <asm/apic.h>
-#include <asm/apic.h>
 #endif
 
 static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 3340cc0f244e33a9b794ea50ef40f9f4e51843bf..ff958248e61d7d48965c7b61c3cfdf32bc551f23 100644 (file)
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -28,8 +28,6 @@
 #include <asm/reboot.h>
 #include <asm/virtext.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 6cdfb3e4dc3301b9295a4b763410c4f9b97b95d3..352d870e5d55fbc304bb57a5ebf926264571cb01 100644 (file)
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/es7000_32.c
@@ -387,7 +387,6 @@ void __init es7000_enable_apic_mode(void)
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <asm/mpspec.h>
-#include <asm/apic.h>
 #include <asm/fixmap.h>
 #include <asm/apicdef.h>
 #include <linux/kernel.h>

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index e4ac7c80e2df0095069bf6f4f0cec1a3d4ee808d..9dc6b2b24275cdc77b88fb8da2c3d7daebbf45b2 100644 (file)
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -212,7 +212,6 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-#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/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 5a2d75d1fd4449a9ab79afbb789b2f7ee46b8aa5..40400a58845426fe1cdd72ea48050c3f06a20813 100644 (file)
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -301,7 +301,6 @@ int __init get_memcfg_numaq(void)
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <asm/mpspec.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 be0d554984a72b21a05f29ddb405ced29b42e2b6..fd1352ac909ccf7e9735c1d6659754188857b043 100644 (file)
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -23,14 +23,12 @@
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <asm/mpspec.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/apic.h>
 #include <asm/ipi.h>
 
 #include <linux/smp.h>
@@ -41,8 +39,6 @@
 #include <asm/e820.h>
 #include <asm/setup.h>
 
-#include <asm/apic.h>
-
 #ifdef CONFIG_HOTPLUG_CPU
 #define DEFAULT_SEND_IPI       (1)
 #else

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 7c8cd447d5ed520434fac0d5802cc593946857a9..1cc18d439bbbd377bd6941eece6fa2397508d359 100644 (file)
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -24,8 +24,6 @@
 # include <asm/iommu.h>
 #endif
 
-#include <asm/apic.h>
-
 /*
  * Power off function, if any
  */

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index deaafd2693ee761c748e7514e261acefef91751a..b2da0b1d15e7ac7d3dbaf8cc69d699d8898907a2 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -97,7 +97,6 @@
 #include <asm/mmu_context.h>
 #include <asm/proto.h>
 
-#include <asm/apic.h>
 #include <asm/paravirt.h>
 #include <asm/hypervisor.h>
 

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 562a9fc3bc342329b9239fcd9e05d4f9d99ed2d7..09e73876a44fbff25d1cb80941530155e8c4f3ef 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -65,7 +65,6 @@
 #include <asm/uv/uv.h>
 #include <linux/mc146818rtc.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 eb31ba276bb3cb158a5aab0e875d70ca0df82ecd..577b0bd8e537cab27e88ff112ba22cc0083a09c3 100644 (file)
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
@@ -40,7 +40,6 @@
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <asm/smp.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 1a7dfa7cb525b5a6bb10fc433e8f28bf52f662a7..f04549afcfe9369b8581159088808f7a7a1ffd9a 100644 (file)
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -20,8 +20,6 @@
 #include <asm/tsc.h>
 #include <asm/irq_vectors.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/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 5264fea6c28139e6ea97c95ed3a3a4720814aafd..34199d30ff460e1473265cdd7d17e1c701c65d96 100644 (file)
--- a/arch/x86/kernel/visws_quirks.c
+++ b/arch/x86/kernel/visws_quirks.c
@@ -29,13 +29,10 @@
 #include <asm/fixmap.h>
 #include <asm/reboot.h>
 #include <asm/setup.h>
+#include <asm/apic.h>
 #include <asm/e820.h>
 #include <asm/io.h>
 
-#include <asm/apic.h>
-
-#include <asm/apic.h>
-
 #include <linux/kernel_stat.h>
 
 #include <asm/i8259.h>
@@ -49,8 +46,6 @@
 
 extern int no_broadcast;
 
-#include <asm/apic.h>
-
 char visws_board_type  = -1;
 char visws_board_rev   = -1;
 

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index b641349fe07712dde4b1e250c5599d8b5c2c74ac..a654d59e448327e640d239698625afaf9944d34e 100644 (file)
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -14,7 +14,6 @@
 DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate)
                        = { &init_mm, 0, };
 
-#include <asm/apic.h>
 /*
  *     Smarter SMP flushing macros.
  *             c/o Linus Torvalds.