X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fnmi.c;h=9cb42ecb7f8966bb90bf3426f8b82e0cad9b55cf;hb=cee324b145a1e5488b34191de670e5ed1d346ebb;hp=186aebbae32d25414b076bb53762ac31de6c5c6e;hpb=cece901481bafbf14de8cbd3a89ae869ea881055;p=powerpc.git diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 186aebbae3..9cb42ecb7f 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c @@ -302,8 +302,6 @@ int __init setup_nmi_watchdog(char *str) if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE)) return 0; - if ((nmi == NMI_LOCAL_APIC) && (nmi_known_cpu() == 0)) - return 0; /* no lapic support */ nmi_watchdog = nmi; return 1; }