Commit d9586548 authored by Daniel Walker's avatar Daniel Walker Committed by Linus Torvalds

i386: fix a hang on stuck nmi watchdog

In the case when an nmi gets stucks the endflag stays equal to zero.
This causes the busy looping on other cpus to continue, even though the
nmi test is done.

On my machine with out the change below the system would hang right
after check_nmi_watchdog().  The change below just sets endflag prior to
checking if the test was successful or not.
Signed-off-by: default avatarDaniel Walker <dwalker@mvista.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a534b679
...@@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void) ...@@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void)
atomic_dec(&nmi_active); atomic_dec(&nmi_active);
} }
} }
endflag = 1;
if (!atomic_read(&nmi_active)) { if (!atomic_read(&nmi_active)) {
kfree(prev_nmi_count); kfree(prev_nmi_count);
atomic_set(&nmi_active, -1); atomic_set(&nmi_active, -1);
return -1; return -1;
} }
endflag = 1;
printk("OK.\n"); printk("OK.\n");
/* now that we know it works we can reduce NMI frequency to /* now that we know it works we can reduce NMI frequency to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment