x86: untable __init references between IO data

Earlier patch added IO APIC setup into local APIC setup. This caused
modpost warnings. Fix them by untangling setup_local_APIC() and splitting
it into smaller functions. The IO APIC initialization is only called
for the BP init.

Also removed some outdated debugging code and minor cleanup.

[ tglx: arch/x86 adaptation ]

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 8 insertions, 0 deletions

diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 7552db9ee9ff..ddefb38c53fb 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -210,6 +210,7 @@ void __cpuinit smp_callin(void)
 
         Dprintk("CALLIN, before setup_local_APIC().\n");
         setup_local_APIC();
+        end_local_APIC_setup();
 
         /*
          * Get our bogomips.
@@ -884,6 +885,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
          */
         setup_local_APIC();
 
+        /*
+         * Enable IO APIC before setting up error vector
+         */
+        if (!skip_ioapic_setup && nr_ioapics)
+                enable_IO_APIC();
+        end_local_APIC_setup();
+
         if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_id) {
                 panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
                       GET_APIC_ID(apic_read(APIC_ID)), boot_cpu_id);