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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
smpboot_hooks.h
diff --git
a/arch/x86/include/asm/smpboot_hooks.h
b/arch/x86/include/asm/smpboot_hooks.h
index
1def601
..
6c22bf3
100644
(file)
--- a/
arch/x86/include/asm/smpboot_hooks.h
+++ b/
arch/x86/include/asm/smpboot_hooks.h
@@
-48,7
+48,6
@@
static inline void __init smpboot_setup_io_apic(void)
setup_IO_APIC();
else {
nr_ioapics = 0;
- localise_nmi_watchdog();
}
#endif
}