1 files changed, 5 insertions, 18 deletions

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 1b291da09e60..eb35ef9ee63f 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -66,21 +66,6 @@ static void setup_apic_flat_routing(void)
 #endif
 }
 
-static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
-{
-        /*
-         * Careful. Some cpus do not strictly honor the set of cpus
-         * specified in the interrupt destination when using lowest
-         * priority interrupt delivery mode.
-         *
-         * In particular there was a hyperthreading cpu observed to
-         * deliver interrupts to the wrong hyperthread when only one
-         * hyperthread was specified in the interrupt desitination.
-         */
-        cpumask_clear(retmask);
-        cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
-}
-
 /* should be called last. */
 static int probe_default(void)
 {
@@ -105,7 +90,7 @@ static struct apic apic_default = {
         .check_apicid_used              = default_check_apicid_used,
         .check_apicid_present           = default_check_apicid_present,
 
-        .vector_allocation_domain       = default_vector_allocation_domain,
+        .vector_allocation_domain       = flat_vector_allocation_domain,
         .init_apic_ldr                  = default_init_apic_ldr,
 
         .ioapic_phys_id_map             = default_ioapic_phys_id_map,
@@ -123,8 +108,7 @@ static struct apic apic_default = {
         .set_apic_id                    = NULL,
         .apic_id_mask                   = 0x0F << 24,
 
-        .cpu_mask_to_apicid             = default_cpu_mask_to_apicid,
-        .cpu_mask_to_apicid_and         = default_cpu_mask_to_apicid_and,
+        .cpu_mask_to_apicid_and         = flat_cpu_mask_to_apicid_and,
 
         .send_IPI_mask                  = default_send_IPI_mask_logical,
         .send_IPI_mask_allbutself       = default_send_IPI_mask_allbutself_logical,
@@ -208,6 +192,9 @@ void __init default_setup_apic_routing(void)
 
         if (apic->setup_apic_routing)
                 apic->setup_apic_routing();
+
+        if (x86_platform.apic_post_init)
+                x86_platform.apic_post_init();
 }
 
 void __init generic_apic_probe(void)