Revert "xen/apic: Provide an 'apic_xen' to set the override the apic->[read|write...

This reverts commit c3dd7941354fa96a71f2613e2c7a1b215fa175dc.  It prevents
the kernel from booting natively on hardware.

Conflicts:

	arch/x86/xen/enlighten.c

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 798904d560559dacdb0f099c8884f6ca2c2f2648..88b9d22c84328746210fae7c27fde54f2a699160 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -174,15 +174,11 @@ extern struct apic apic_summit;
 extern struct apic apic_bigsmp;
 extern struct apic apic_es7000;
 extern struct apic apic_es7000_cluster;
-extern struct apic apic_xen;
 
 struct apic *apic = &apic_default;
 EXPORT_SYMBOL_GPL(apic);
 
 static struct apic *apic_probe[] __initdata = {
-#ifdef CONFIG_XEN
-       &apic_xen,
-#endif
 #ifdef CONFIG_X86_NUMAQ
        &apic_numaq,
 #endif

diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index 1c34eabe31c89d3323224d87d4a0e57d921d4e00..9924e72069e570807841690da804b012ae6a1b7c 100644 (file)
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -28,15 +28,11 @@ extern struct apic apic_physflat;
 extern struct apic apic_x2xpic_uv_x;
 extern struct apic apic_x2apic_phys;
 extern struct apic apic_x2apic_cluster;
-extern struct apic apic_xen;
 
 struct apic __read_mostly *apic = &apic_flat;
 EXPORT_SYMBOL_GPL(apic);
 
 static struct apic *apic_probe[] __initdata = {
-#ifdef CONFIG_XEN
-       &apic_xen,
-#endif
 #ifdef CONFIG_X86_UV
        &apic_x2apic_uv_x,
 #endif

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 7cb12e0668c636dbdd1db3c01095a0f3b8d8f856..7a48c0bdd07faddb9898d11af8eef33022a7afa3 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -750,27 +750,6 @@ static u32 xen_safe_apic_wait_icr_idle(void)
         return 0;
 }
 
-static __init int xen_safe_flat_acpi_madt_oem_check(char *oem_id,
-                                                   char *oem_table_id)
-{
-       if (!xen_initial_domain())
-               return 0;
-
-       return 1;
-}
-
-static __init int xen_safe_probe(void) {
-
-       if (!xen_pv_domain())
-               return 0;
-
-       return 1;
-}
-
-struct apic apic_xen = {
-       .name   = "xen",
-};
-
 static __init void set_xen_basic_apic_ops(void)
 {
        apic->read = xen_apic_read;
@@ -779,11 +758,6 @@ static __init void set_xen_basic_apic_ops(void)
        apic->icr_write = xen_apic_icr_write;
        apic->wait_icr_idle = xen_apic_wait_icr_idle;
        apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle;
-       apic->probe = xen_safe_probe;
-       apic->acpi_madt_oem_check  = xen_safe_flat_acpi_madt_oem_check;
-       /* Copy over the full contents of the newly modified apic into
-        * our apic_xen, which is to be called first by apic_probe[]. */
-       memcpy(&apic_xen, apic, sizeof(struct apic));
 }
 
 #endif