aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
-rw-r--r--arch/x86/kernel/apic_32.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index c44206e731d..45d8da405ad 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1153,9 +1153,6 @@ static int __init detect_init_APIC(void)
1153 if (l & MSR_IA32_APICBASE_ENABLE) 1153 if (l & MSR_IA32_APICBASE_ENABLE)
1154 mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; 1154 mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;
1155 1155
1156 if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
1157 nmi_watchdog = NMI_LOCAL_APIC;
1158
1159 printk(KERN_INFO "Found and enabled local APIC!\n"); 1156 printk(KERN_INFO "Found and enabled local APIC!\n");
1160 1157
1161 apic_pm_activate(); 1158 apic_pm_activate();
@@ -1268,6 +1265,10 @@ int __init APIC_init_uniprocessor(void)
1268 1265
1269 setup_local_APIC(); 1266 setup_local_APIC();
1270 1267
1268#ifdef CONFIG_X86_IO_APIC
1269 if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)
1270#endif
1271 localise_nmi_watchdog();
1271 end_local_APIC_setup(); 1272 end_local_APIC_setup();
1272#ifdef CONFIG_X86_IO_APIC 1273#ifdef CONFIG_X86_IO_APIC
1273 if (smp_found_config) 1274 if (smp_found_config)