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

Commit 6fe9fe87 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Revert "x86: APIC/SMP: downgrade the NMI watchdog for "nosmp"" 

This reverts commit 791b93d3dfaf16c23e978bec0cc0a3dd9d855d63.

A better fix from Maciej will be merged.
parent ab5a5be0

arch/x86/kernel/smpboot.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1159,10 +1159,6 @@ static int __init smp_sanity_check(unsigned max_cpus) 
	if (!max_cpus) {

	if (!max_cpus) {

		printk(KERN_INFO "SMP mode deactivated.\n");

		printk(KERN_INFO "SMP mode deactivated.\n");

		smpboot_clear_io_apic();

		smpboot_clear_io_apic();



		if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)

			nmi_watchdog = NMI_LOCAL_APIC;



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

		connect_bsp_APIC();

		connect_bsp_APIC();

#endif

#endif