From: Maciej W. Rozycki Date: Fri, 6 Jun 2008 02:27:56 +0000 (+0100) Subject: x86: APIC/UP: Remove redundant NMI watchdog downgrade X-Git-Tag: v2.6.27-rc1~1106^2~251^2~8 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=19662027488946e34dd54d3bb408fa3307681d7d;p=~shefty%2Frdma-dev.git x86: APIC/UP: Remove redundant NMI watchdog downgrade For the UP case the NMI watchdog downgrade is done consistently in APIC_init_uniprocessor() now. Remove redundant code used only when BIOS-disabled local APIC is activated. Signed-off-by: Maciej W. Rozycki Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 26e7a62e9ab..126e87153b3 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1154,9 +1154,6 @@ static int __init detect_init_APIC(void) if (l & MSR_IA32_APICBASE_ENABLE) mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; - if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) - nmi_watchdog = NMI_LOCAL_APIC; - printk(KERN_INFO "Found and enabled local APIC!\n"); apic_pm_activate();