Commit:     d95865480de280b892e19fe90921601876da5775
Parent:     a534b679180025aa324ebd63c05516e478551cfd
Author:     Daniel Walker <[EMAIL PROTECTED]>
AuthorDate: Thu Sep 6 16:59:54 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Sep 10 18:57:47 2007 -0700

    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: Daniel Walker <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/kernel/nmi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 8c1c965..c7227e2 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void)
+       endflag = 1;
        if (!atomic_read(&nmi_active)) {
                atomic_set(&nmi_active, -1);
                return -1;
-       endflag = 1;
        /* now that we know it works we can reduce NMI frequency to
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to