Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] fix "NMI appears to be stuck"
Testing NMI watchdog ... CPU#0: NMI appears to be stuck (54->54)!
CPU#1: NMI appears to be stuck (0->0)!
Keep the PIT/HPET alive when nmi_watchdog = 1 is given on the command
line.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by Thomas Gleixner and committed by Linus Torvalds a5f5e43e 6d3baf2e
+9
-2
arch/i386/kernel/apic.c
+9
-2
arch/i386/kernel/apic.c
···
493
493
/* No broadcast on UP ! */
494
494
if (num_possible_cpus() == 1)
495
495
return;
496
-
} else
497
-
lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
496
+
} else {
497
+
/*
498
+
* If nmi_watchdog is set to IO_APIC, we need the
499
+
* PIT/HPET going. Otherwise register lapic as a dummy
500
+
* device.
501
+
*/
502
+
if (nmi_watchdog != NMI_IO_APIC)
503
+
lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
504
+
}
498
505
499
506
/* Setup the lapic or request the broadcast */
500
507
setup_APIC_timer();