]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/x86/kernel/apic/io_apic.c
Merge branch 'linus' into x86/urgent
[linux-2.6.git] / arch / x86 / kernel / apic / io_apic.c
index 809e1cf86d6be50b6d58c87645728f9b757a300f..64970b9885f248d7d0388203477611142ba1b918 100644 (file)
@@ -1874,7 +1874,7 @@ __apicdebuginit(int) print_all_ICs(void)
        print_PIC();
 
        /* don't print out if apic is not there */
-       if (!cpu_has_apic || disable_apic)
+       if (!cpu_has_apic && !apic_from_smp_config())
                return 0;
 
        print_all_local_APICs();
@@ -1999,7 +1999,7 @@ void disable_IO_APIC(void)
        /*
         * Use virtual wire A mode when interrupt remapping is enabled.
         */
-       if (cpu_has_apic)
+       if (cpu_has_apic || apic_from_smp_config())
                disconnect_bsp_APIC(!intr_remapping_enabled &&
                                ioapic_i8259.pin != -1);
 }