AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] fix "NMI appears to be stuck"

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2007-03-05 00:30:45 -08:00 committed by Linus Torvalds
parent 6d3baf2eb8
commit a5f5e43e2b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/i386/kernel/apic.c
View File

@ -493,8 +493,15 @@ void __init setup_boot_APIC_clock(void)
/* No broadcast on UP ! */ /* No broadcast on UP ! */
if (num_possible_cpus() == 1) if (num_possible_cpus() == 1)
return; return;
} else } else {
lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; /*
* 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 the lapic or request the broadcast */
setup_APIC_timer(); setup_APIC_timer();