From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
macro@linux-mips.org
Cc: linux-kernel@vger.kernel.org, gorcunov@gmail.com
Subject: [patch 1/2] x86: nmi - consolidate nmi_watchdog_default for 32bit mode
Date: Thu, 01 Jan 1970 03:00:01 +0300 [thread overview]
Message-ID: <48459207.0637560a.672f.1b0d@mx.google.com> (raw)
In-Reply-To: 20080603184648.162308982@gmail.com
[-- Attachment #1: nmi-consolidate-nmi_watchdog_default --]
[-- Type: text/plain, Size: 2221 bytes --]
64bit mode bootstrap code does set nmi_watchdog to NMI_NONE
by default and doing the same on 32bit mode is safe too.
Such an action saves us from several #ifdef.
Btw, my previous commit
commit 19ec673ced067316b9732bc6d1c4ff4052e5f795
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed May 28 23:00:47 2008 +0400
x86: nmi - fix incorrect NMI watchdog used by default
did not fix the problem completely, moreover it
introduced additional bug - nmi_watchdog would be
set to either NMI_LOCAL_APIC or NMI_IO_APIC
_regardless_ to boot option if being enabled thru
/proc/sys/kernel/nmi_watchdog. Sorry for that.
Fix it too.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
Index: linux-2.6.git/arch/x86/kernel/nmi.c
====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/nmi.c 2008-06-02 18:03:13.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/nmi.c 2008-06-02 20:33:31.000000000 +0400
@@ -487,14 +487,16 @@ int proc_nmi_enabled(struct ctl_table *t
return -EIO;
}
-#ifdef CONFIG_X86_64
/* if nmi_watchdog is not set yet, then set it */
nmi_watchdog_default();
-#else
- if (lapic_watchdog_ok())
- nmi_watchdog = NMI_LOCAL_APIC;
- else
- nmi_watchdog = NMI_IO_APIC;
+
+#ifdef CONFIG_X86_32
+ if (nmi_watchdog == NMI_NONE) {
+ if (lapic_watchdog_ok())
+ nmi_watchdog = NMI_LOCAL_APIC;
+ else
+ nmi_watchdog = NMI_IO_APIC;
+ }
#endif
if (nmi_watchdog == NMI_LOCAL_APIC) {
Index: linux-2.6.git/include/asm-x86/nmi.h
====================================================================
--- linux-2.6.git.orig/include/asm-x86/nmi.h 2008-06-02 18:03:14.000000000 +0400
+++ linux-2.6.git/include/asm-x86/nmi.h 2008-06-02 20:31:48.000000000 +0400
@@ -38,12 +38,10 @@ static inline void unset_nmi_pm_callback
#ifdef CONFIG_X86_64
extern void default_do_nmi(struct pt_regs *);
-extern void nmi_watchdog_default(void);
-#else
-#define nmi_watchdog_default() do { } while (0)
#endif
extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
+extern void nmi_watchdog_default(void);
extern int check_nmi_watchdog(void);
extern int nmi_watchdog_enabled;
extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
--
next parent reply other threads:[~2008-06-03 18:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080603184648.162308982@gmail.com>
1970-01-01 0:00 ` Cyrill Gorcunov [this message]
1970-01-01 0:00 ` [patch 2/2] x86: watchdog - check for CPU is being supported Cyrill Gorcunov
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=48459207.0637560a.672f.1b0d@mx.google.com \
--to=gorcunov@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.