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

Commit 3fb450a3 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

x86: enable NMI watchdog on nosmp 



if nosmp has been passed as a boot option, but nmi_watchdog=2 has also
been enabled then keep minimal local APIC functionality around to make
the watchdog work.

this allowed me to debug a hard hang that would only occur with a nosmp
bootup.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2f62c941

arch/x86/kernel/smpboot_32.c

+6 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,12 @@ static void __init smp_boot_cpus(unsigned int max_cpus) 
	if (!max_cpus) {

		smp_found_config = 0;

		printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");



		if (nmi_watchdog == NMI_LOCAL_APIC) {

			printk(KERN_INFO "activating minimal APIC for NMI watchdog use.\n");

			connect_bsp_APIC();

			setup_local_APIC();

		}

		smpboot_clear_io_apic_irqs();

		phys_cpu_present_map = physid_mask_of_physid(0);

		cpu_set(0, per_cpu(cpu_sibling_map, 0));