git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86: APIC/UP: Remove redundant NMI watchdog downgrade
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic_32.c
diff --git
a/arch/x86/kernel/apic_32.c
b/arch/x86/kernel/apic_32.c
index
26e7a62
..
126e871
100644
(file)
--- 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();