Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=58d9ce7d751fa11c6c8ea5dcd4d63b320aae1363
Commit:     58d9ce7d751fa11c6c8ea5dcd4d63b320aae1363
Parent:     bbe1a59b3a3d4af3869647d294618a23f6c9c6a4
Author:     Venkatesh Pallipadi <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 22 20:40:34 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Jan 23 07:52:05 2007 -0800

    [PATCH] Revert nmi_known_cpu() check during boot option parsing
    
    Commit f2802e7f571c05f9a901b1f5bd144aa730ccc88e and its x86 version
    (b7471c6da94d30d3deadc55986cc38d1ff57f9ca) adds nmi_known_cpu() check
    while parsing boot options in x86_64 and i386.
    
    With that, "nmi_watchdog=2" stops working for me on Intel Core 2 CPU
    based system.
    
    The problem is, setup_nmi_watchdog is called while parsing the boot
    option and identify_cpu is not done yet.  So, the return value of
    nmi_known_cpu() is not valid at this point.
    
    So revert that check.  This should not have any adverse effect as the
    nmi_known_cpu() check is done again later in enable_lapic_nmi_watchdog().
    
    Signed-off-by: Venkatesh Pallipadi <[EMAIL PROTECTED]>
    Cc: Don Zickus <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/i386/kernel/nmi.c   |    8 +-------
 arch/x86_64/kernel/nmi.c |    2 --
 2 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index a5e34d6..1a6f8bb 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -310,13 +310,7 @@ static int __init setup_nmi_watchdog(char *str)
 
        if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE))
                return 0;
-       /*
-        * If any other x86 CPU has a local APIC, then
-        * please test the NMI stuff there and send me the
-        * missing bits. Right now Intel P6/P4 and AMD K7 only.
-        */
-       if ((nmi == NMI_LOCAL_APIC) && (nmi_known_cpu() == 0))
-               return 0;  /* no lapic support */
+
        nmi_watchdog = nmi;
        return 1;
 }
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 186aebb..9cb42ec 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -302,8 +302,6 @@ int __init setup_nmi_watchdog(char *str)
        if ((nmi >= NMI_INVALID) || (nmi < NMI_NONE))
                return 0;
 
-       if ((nmi == NMI_LOCAL_APIC) && (nmi_known_cpu() == 0))
-               return 0;  /* no lapic support */
        nmi_watchdog = nmi;
        return 1;
 }
-
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  http://vger.kernel.org/majordomo-info.html

Reply via email to