projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream-fixes
[linux-drm-fsl-dcu.git]
/
arch
/
x86_64
/
kernel
/
nmi.c
diff --git
a/arch/x86_64/kernel/nmi.c
b/arch/x86_64/kernel/nmi.c
index 186aebbae32d25414b076bb53762ac31de6c5c6e..9cb42ecb7f8966bb90bf3426f8b82e0cad9b55cf 100644
(file)
--- 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;
}