Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4626df18 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6d60cd53

arch/x86/kernel/nmi_32.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

arch/x86/kernel/smpboot_32.c

+1 −0
Original line number Diff line number Diff line
@@ -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();

}