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
Automatic merge of /spare/repo/netdev-2.6 branch sis900
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
apic.c
diff --git
a/arch/x86_64/kernel/apic.c
b/arch/x86_64/kernel/apic.c
index
7f0b44e
..
f8e6cc4
100644
(file)
--- a/
arch/x86_64/kernel/apic.c
+++ b/
arch/x86_64/kernel/apic.c
@@
-33,6
+33,7
@@
#include <asm/mpspec.h>
#include <asm/pgalloc.h>
#include <asm/mach_apic.h>
+#include <asm/nmi.h>
int apic_verbosity;
@@
-1056,7
+1057,7
@@
int __init APIC_init_uniprocessor (void)
nr_ioapics = 0;
#endif
setup_boot_APIC_clock();
-
+ check_nmi_watchdog();
return 0;
}