From 9707803874bfe71c5c78c25b5b419502086cf377 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 6 Jun 2008 03:28:13 +0100 Subject: [PATCH] --- yaml --- r: 99343 b: refs/heads/master c: d788bada2f6c49673f85338ac4c0c642e5e52cff h: refs/heads/master i: 99341: 86586f6f192a126d00cf2e3da6fe99078e88dc3c 99339: ed4d75cfbcfb84de0897b087bcdc38d14f89a92a 99335: dac1005eb0af5fd03e9ae63ec230fa0c9c3fb2a4 99327: e206a8aecbd055021f8d5408da59f2698ea712aa v: v3 --- [refs] | 2 +- trunk/include/asm-x86/mach-default/smpboot_hooks.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dd9567624d3e..e6db6bc5ab8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d54db1ac9ecde9bcb8a561595b02c1d970d3a4d6 +refs/heads/master: d788bada2f6c49673f85338ac4c0c642e5e52cff diff --git a/trunk/include/asm-x86/mach-default/smpboot_hooks.h b/trunk/include/asm-x86/mach-default/smpboot_hooks.h index 56d0e1fa0258..b63c52182006 100644 --- a/trunk/include/asm-x86/mach-default/smpboot_hooks.h +++ b/trunk/include/asm-x86/mach-default/smpboot_hooks.h @@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void) */ if (!skip_ioapic_setup && nr_ioapics) setup_IO_APIC(); - else + else { nr_ioapics = 0; + localise_nmi_watchdog(); + } } static inline void smpboot_clear_io_apic(void)