Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard...

[cascardo/linux.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 5492798..2d872e0 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -168,10 +168,6 @@ static void smp_callin(void)
         * CPU, first the APIC. (this is probably redundant on most
         * boards)
         */
-
-       pr_debug("CALLIN, before setup_local_APIC()\n");
-       if (apic->smp_callin_clear_local_apic)
-               apic->smp_callin_clear_local_apic();
        setup_local_APIC();
        end_local_APIC_setup();
 
@@ -1143,10 +1139,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
                enable_IO_APIC();
 
        bsp_end_local_APIC_setup();
-
-       if (apic->setup_portio_remap)
-               apic->setup_portio_remap();
-
        smpboot_setup_io_apic();
        /*
         * Set up local APIC timer on boot CPU.