x86: Drop includes of mach_apic.h

A number of files don't need mach_apic.h at all, or only need transitive
dependences.  Drop the includes.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index ff4cd22897975e9de253c1a7c3dfd0485f617bd1..067d855badf016d1df4b5c89799f54eb8866f038 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -18,7 +18,6 @@
 #include <asm/random.h>
 #include <asm/setup.h>
 #include <asm/shstk.h>
-#include <mach_apic.h>
 #include <public/sysctl.h> /* for XEN_INVALID_{SOCKET,CORE}_ID */
 
 #include "cpu.h"

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index 807b708217e9f39fd5d1573feb89d9fc53acc639..6a7347968ba2367b3b5d4aa4f1e73f5e007ef9be 100644 (file)
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -14,8 +14,6 @@
 #include <asm/i387.h>
 #include <asm/trampoline.h>
 
-#include <mach_apic.h>
-
 #include "cpu.h"
 
 /*

diff --git a/xen/arch/x86/genapic/delivery.c b/xen/arch/x86/genapic/delivery.c
index 3def78f380d37d4540e8a81ac3d4933617eee7b3..7bb7bd658650052c9cf95796bd116faef0090d49 100644 (file)
--- a/xen/arch/x86/genapic/delivery.c
+++ b/xen/arch/x86/genapic/delivery.c
@@ -1,9 +1,10 @@
 #include <xen/irq.h>
 #include <xen/sched.h>
+
+#include <asm/apic.h>
 #include <asm/current.h>
 #include <asm/smp.h>
 #include <asm/hardirq.h>
-#include <mach_apic.h>
 
 /*
  * LOGICAL FLAT DELIVERY MODE (multicast via bitmask to <= 8 logical APIC IDs).

diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index 2f54d31889668ee6f51a4eee086905b2d5cba317..51ff7f12f5c0af759401e1939fd3065d971cc5c4 100644 (file)
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -13,11 +13,12 @@
 #include <xen/numa.h>
 #include <xen/param.h>
 #include <xen/sched.h>
+
+#include <asm/apic.h>
 #include <asm/fixmap.h>
 #include <asm/div64.h>
 #include <asm/hpet.h>
 #include <asm/msi.h>
-#include <mach_apic.h>
 #include <xen/cpuidle.h>
 
 #define MAX_DELTA_NS MILLISECS(10*1000)

diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c
index 04c6a0572319a661a45a669150df313695f75c7a..bd337e548c5a0dc1fa67845277532cf87b9c60c1 100644 (file)
--- a/xen/arch/x86/smp.c
+++ b/xen/arch/x86/smp.c
@@ -14,7 +14,10 @@
 #include <xen/delay.h>
 #include <xen/perfc.h>
 #include <xen/spinlock.h>
+
+#include <asm/apic.h>
 #include <asm/current.h>
+#include <asm/genapic.h>
 #include <asm/guest.h>
 #include <asm/smp.h>
 #include <asm/mc146818rtc.h>
@@ -23,7 +26,6 @@
 #include <asm/hpet.h>
 #include <asm/setup.h>
 #include <irq_vectors.h>
-#include <mach_apic.h>
 
 /* Helper functions to prepare APIC register values. */
 static unsigned int prepare_ICR(unsigned int shortcut, int vector)

diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c
index 7b09046229316b84fd402b7889da4c5ad96fbaca..7fe5663c598453bf9521e1ec370b1b506d8b3c40 100644 (file)
--- a/xen/arch/x86/x86_64/acpi_mmcfg.c
+++ b/xen/arch/x86/x86_64/acpi_mmcfg.c
@@ -37,7 +37,6 @@
 #include <asm/io.h>
 #include <asm/mpspec.h>
 #include <asm/processor.h>
-#include <mach_apic.h>
 
 #include "mmconfig.h"