From: Glauber de Oliveira Costa Date: Wed, 19 Mar 2008 17:25:37 +0000 (-0300) Subject: x86: call check_nmi_watchdog explicitly in native_smp_cpus_done X-Git-Tag: v2.6.26-rc1~1154^2~359 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4626df1801dc03de42f1c155417393b91c8f5d97;p=linux-2.6-omap-h63xx.git x86: call check_nmi_watchdog explicitly in native_smp_cpus_done With this, remove its late_initcall marker from nmi_32.c Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 16738515576..9cfc094eddb 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/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/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index bfdfe3c64d0..1f3aff4caaf 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/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(); }