Clean up subarch 'mach-foo' header files. No need for

subarch apicdef.h and ipi.h can be much simplified.

Signed-off-by: Keir Fraser <keir@xensource.com>

5 files changed, 20 insertions, 22 deletions

diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c
index 61b594a409..4338e5765e 100644
--- a/xen/arch/x86/genapic/bigsmp.c
+++ b/xen/arch/x86/genapic/bigsmp.c
@@ -2,7 +2,6 @@
  * APIC driver for "bigsmp" XAPIC machines with more than 8 virtual CPUs.
  * Drives the local APIC in "clustered mode".
  */
-#define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
 #include <asm/current.h>
@@ -14,9 +13,8 @@
 #include <xen/smp.h>
 #include <xen/init.h>
 #include <xen/dmi.h>
+#include <asm/mach_ipi.h>
 #include <asm/mach-bigsmp/mach_apic.h>
-#include <asm/mach-bigsmp/mach_apicdef.h>
-#include <asm/mach-bigsmp/mach_ipi.h>
 #include <asm/mach-default/mach_mpparse.h>
 
 static int dmi_bigsmp; /* can be set by dmi scanners */
@@ -52,4 +50,7 @@ static __init int probe_bigsmp(void)
 	return dmi_bigsmp; 
 } 
 
-struct genapic apic_bigsmp = APIC_INIT("bigsmp", probe_bigsmp); 
+struct genapic apic_bigsmp = {
+	APIC_INIT("bigsmp", probe_bigsmp),
+	.send_ipi_mask = send_IPI_mask_sequence
+};
diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c
index d84cf41141..a7403922bb 100644
--- a/xen/arch/x86/genapic/default.c
+++ b/xen/arch/x86/genapic/default.c
@@ -1,12 +1,10 @@
 /* 
  * Default generic APIC driver. This handles upto 8 CPUs.
  */
-#define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
 #include <asm/current.h>
 #include <asm/mpspec.h>
-#include <asm/mach-default/mach_apicdef.h>
 #include <asm/genapic.h>
 #include <asm/fixmap.h>
 #include <asm/apicdef.h>
@@ -14,8 +12,8 @@
 #include <xen/string.h>
 #include <xen/smp.h>
 #include <xen/init.h>
+#include <asm/mach_ipi.h>
 #include <asm/mach-default/mach_apic.h>
-#include <asm/mach-default/mach_ipi.h>
 #include <asm/mach-default/mach_mpparse.h>
 
 /* should be called last. */
@@ -24,4 +22,7 @@ static __init int probe_default(void)
 	return 1;
 } 
 
-struct genapic apic_default = APIC_INIT("default", probe_default); 
+struct genapic apic_default = {
+	APIC_INIT("default", probe_default),
+	.send_ipi_mask = send_IPI_mask_bitmask
+};
diff --git a/xen/arch/x86/genapic/es7000.c b/xen/arch/x86/genapic/es7000.c
index 05e94b0f04..37c959bf4c 100644
--- a/xen/arch/x86/genapic/es7000.c
+++ b/xen/arch/x86/genapic/es7000.c
@@ -1,7 +1,6 @@
 /*
  * APIC driver for the Unisys ES7000 chipset.
  */
-#define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
 #include <asm/current.h>
@@ -14,11 +13,9 @@
 #include <xen/string.h>
 #include <xen/smp.h>
 #include <xen/init.h>
-#include <asm/mach-es7000/mach_apicdef.h>
+#include <asm/mach_ipi.h>
 #include <asm/mach-es7000/mach_apic.h>
-#include <asm/mach-es7000/mach_ipi.h>
 #include <asm/mach-es7000/mach_mpparse.h>
-#include <asm/mach-es7000/mach_wakecpu.h>
 
 static __init int probe_es7000(void)
 {
@@ -26,4 +23,7 @@ static __init int probe_es7000(void)
 	return 0;
 }
 
-struct genapic apic_es7000 = APIC_INIT("es7000", probe_es7000);
+struct genapic apic_es7000 = {
+	APIC_INIT("es7000", probe_es7000),
+	.send_ipi_mask = send_IPI_mask_sequence
+};
diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c
index cddde7a459..4b1d375b1d 100644
--- a/xen/arch/x86/genapic/probe.c
+++ b/xen/arch/x86/genapic/probe.c
@@ -103,8 +103,3 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 	} 
 	return 0;	
 }
-
-int hard_smp_processor_id(void)
-{
-	return genapic->get_apic_id(*(unsigned long *)(APIC_BASE+APIC_ID));
-}
diff --git a/xen/arch/x86/genapic/summit.c b/xen/arch/x86/genapic/summit.c
index 28a47f09de..acf191acfc 100644
--- a/xen/arch/x86/genapic/summit.c
+++ b/xen/arch/x86/genapic/summit.c
@@ -1,7 +1,6 @@
 /* 
  * APIC driver for the IBM "Summit" chipset.
  */
-#define APIC_DEFINITION 1
 #include <xen/config.h>
 #include <xen/cpumask.h>
 #include <asm/current.h>
@@ -13,9 +12,8 @@
 #include <xen/string.h>
 #include <xen/smp.h>
 #include <xen/init.h>
+#include <asm/mach_ipi.h>
 #include <asm/mach-summit/mach_apic.h>
-#include <asm/mach-summit/mach_apicdef.h>
-#include <asm/mach-summit/mach_ipi.h>
 #include <asm/mach-summit/mach_mpparse.h>
 
 static __init int probe_summit(void)
@@ -24,4 +22,7 @@ static __init int probe_summit(void)
 	return 0;
 } 
 
-struct genapic apic_summit = APIC_INIT("summit", probe_summit); 
+struct genapic apic_summit = {
+	APIC_INIT("summit", probe_summit),
+	.send_ipi_mask = send_IPI_mask_sequence
+};