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
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic
/
nmi.c
diff --git
a/arch/x86/kernel/apic/nmi.c
b/arch/x86/kernel/apic/nmi.c
index
bd7c96b
..
8aa65ad
100644
(file)
--- a/
arch/x86/kernel/apic/nmi.c
+++ b/
arch/x86/kernel/apic/nmi.c
@@
-177,7
+177,7
@@
int __init check_nmi_watchdog(void)
error:
if (nmi_watchdog == NMI_IO_APIC) {
if (!timer_through_8259)
-
disable_8259A_irq
(0);
+
legacy_pic->chip->mask
(0);
on_each_cpu(__acpi_nmi_disable, NULL, 1);
}