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

Commit 1f992153 authored by Chris McDermott's avatar Chris McDermott Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Fix NMI watchdog on x460 



[description from AK]

Old check for the IO-APIC watchdog during the timer check was wrong -
it obviously should only drop into this if the IO-APIC watchdog is used.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e78256b8

arch/x86_64/kernel/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1850,7 +1850,7 @@ static inline void check_timer(void) 
	}

	printk(" failed.\n");



	if (nmi_watchdog) {

	if (nmi_watchdog == NMI_IO_APIC) {

		printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");

		nmi_watchdog = 0;

	}