---

yaml --- r: 99342 b: refs/heads/master c: d54db1a h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · 9ef985f · 9ef985f
1 parent 86586f6
commit 9ef985f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19662027488946e34dd54d3bb408fa3307681d7d
+refs/heads/master: d54db1ac9ecde9bcb8a561595b02c1d970d3a4d6
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
@@ -1159,6 +1159,9 @@ static int __init smp_sanity_check(unsigned max_cpus)
 	if (!max_cpus) {
 		printk(KERN_INFO "SMP mode deactivated.\n");
 		smpboot_clear_io_apic();
+
+		localise_nmi_watchdog();
+
 #ifdef CONFIG_X86_32
 		connect_bsp_APIC();
 #endif