From 0d1701ab1704bce4815a2b3b47b0055020a3d437 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Mon, 21 Apr 2008 14:14:44 -0700 Subject: [PATCH] --- yaml --- r: 94837 b: refs/heads/master c: e90955c26d8af318658c45caadb1d330ac6a506c h: refs/heads/master i: 94835: e7e05f8906c77ceac40dbe17a511849938d89790 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5b6b23efcc0b..fed810e60e3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9752082560b440e6a45624569d26802e20d1b8b4 +refs/heads/master: e90955c26d8af318658c45caadb1d330ac6a506c diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index 04c662ba18f1..84241a256dc8 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -1149,14 +1149,10 @@ static int __init smp_sanity_check(unsigned max_cpus) "forcing use of dummy APIC emulation.\n"); smpboot_clear_io_apic(); #ifdef CONFIG_X86_32 - if (nmi_watchdog == NMI_LOCAL_APIC) { - printk(KERN_INFO "activating minimal APIC for" - "NMI watchdog use.\n"); - connect_bsp_APIC(); - setup_local_APIC(); - end_local_APIC_setup(); - } + connect_bsp_APIC(); #endif + setup_local_APIC(); + end_local_APIC_setup(); return -1; }