Merge branches 'x86/acpi', 'x86/apic', 'x86/cpudetect', 'x86/headers', 'x86/paravirt...
[linux-3.10.git] / arch / x86 / kernel / apic.c
index cf2ca19..a894eea 100644 (file)
@@ -1659,35 +1659,31 @@ int __init APIC_init_uniprocessor(void)
        physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);
        setup_local_APIC();
 
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86_IO_APIC
        /*
         * Now enable IO-APICs, actually call clear_IO_APIC
-        * We need clear_IO_APIC before enabling vector on BP
+        * We need clear_IO_APIC before enabling error vector
         */
        if (!skip_ioapic_setup && nr_ioapics)
                enable_IO_APIC();
 #endif
 
-#ifdef CONFIG_X86_IO_APIC
-       if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)
-#endif
-               localise_nmi_watchdog();
        end_local_APIC_setup();
 
 #ifdef CONFIG_X86_IO_APIC
        if (smp_found_config && !skip_ioapic_setup && nr_ioapics)
                setup_IO_APIC();
-# ifdef CONFIG_X86_64
-       else
+       else {
                nr_ioapics = 0;
-# endif
+               localise_nmi_watchdog();
+       }
+#else
+       localise_nmi_watchdog();
 #endif
 
+       setup_boot_clock();
 #ifdef CONFIG_X86_64
-       setup_boot_APIC_clock();
        check_nmi_watchdog();
-#else
-       setup_boot_clock();
 #endif
 
        return 0;