From c00a2d497b264dd172c99d15e3f97d72a84c63cf Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 19 Mar 2008 14:25:37 -0300
Subject: [PATCH] --- yaml --- r: 88823 b: refs/heads/master c:
 4626df1801dc03de42f1c155417393b91c8f5d97 h: refs/heads/master i:   88821:
 c7b50e1482342ebc90adda221d9e61c51995e607   88819:
 74ad59af4b64bf5f8846f7739642b926998fd110   88815:
 433215b64047642fe4de15b7cee51006946e8323 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/nmi_32.c     | 2 --
 trunk/arch/x86/kernel/smpboot_32.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 50505dad375e..c8644402212e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d60cd5359e261cad1e519e77ca733c05c2f8025
+refs/heads/master: 4626df1801dc03de42f1c155417393b91c8f5d97
diff --git a/trunk/arch/x86/kernel/nmi_32.c b/trunk/arch/x86/kernel/nmi_32.c
index 167385155765..9cfc094eddb0 100644
--- a/trunk/arch/x86/kernel/nmi_32.c
+++ b/trunk/arch/x86/kernel/nmi_32.c
@@ -129,8 +129,6 @@ int __init check_nmi_watchdog(void)
 	kfree(prev_nmi_count);
 	return 0;
 }
-/* This needs to happen later in boot so counters are working */
-late_initcall(check_nmi_watchdog);
 
 static int __init setup_nmi_watchdog(char *str)
 {
diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c
index bfdfe3c64d06..1f3aff4caaf7 100644
--- a/trunk/arch/x86/kernel/smpboot_32.c
+++ b/trunk/arch/x86/kernel/smpboot_32.c
@@ -963,5 +963,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
 #ifdef CONFIG_X86_IO_APIC
 	setup_ioapic_dest();
 #endif
+	check_nmi_watchdog();
 	zap_low_mappings();
 }