Commit a5f5e43e authored Mar 05, 2007 by Thomas Gleixner Committed by Linus Torvalds Mar 05, 2007

[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>

parent 6d3baf2e

arch/i386/kernel/apic.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -493,8 +493,15 @@ void __init setup_boot_APIC_clock(void)
		/* No broadcast on UP ! */
		if (num_possible_cpus() == 1)
		return;
		} else
		} else {
		/*
		* If nmi_watchdog is set to IO_APIC, we need the
		* PIT/HPET going. Otherwise register lapic as a dummy
		* device.
		*/
		if (nmi_watchdog != NMI_IO_APIC)
		lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
		}

		/* Setup the lapic or request the broadcast */
		setup_APIC_timer();

Admin message