From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Andi Kleen <ak@suse.de>,
dzickus@redhat.com, linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] Revert nmi_known_cpu() check during boot option parsing
Date: Wed, 10 Jan 2007 15:05:10 -0800 [thread overview]
Message-ID: <20070110150510.A28311@unix-os.sc.intel.com> (raw)
The patch
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f2802e7f571c05f9a901b1f5bd144aa730ccc88e
and another subsequent patch 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.
Revert that check. Should not have any adverse effect as nmi_known_cpu() check
is done again later in enable_lapic_nmi_watchdog().
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Index: linux-2.6.20-rc-mm/arch/i386/kernel/nmi.c
===================================================================
--- linux-2.6.20-rc-mm.orig/arch/i386/kernel/nmi.c
+++ linux-2.6.20-rc-mm/arch/i386/kernel/nmi.c
@@ -325,13 +325,7 @@ static int __init setup_nmi_watchdog(cha
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;
}
Index: linux-2.6.20-rc-mm/arch/x86_64/kernel/nmi.c
===================================================================
--- linux-2.6.20-rc-mm.orig/arch/x86_64/kernel/nmi.c
+++ linux-2.6.20-rc-mm/arch/x86_64/kernel/nmi.c
@@ -310,8 +310,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;
}
reply other threads:[~2007-01-10 23:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070110150510.A28311@unix-os.sc.intel.com \
--to=venkatesh.pallipadi@intel.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=dzickus@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®