From: tip-bot for Cyrill Gorcunov <gorcunov@openvz.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
gorcunov@openvz.org, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/cleanups] x86, nmi: Use predefined numbers instead of hardcoded one
Date: Sun, 7 Jun 2009 14:24:42 GMT [thread overview]
Message-ID: <tip-a4046f8d299e00e9855ae292527c2d66a42670eb@git.kernel.org> (raw)
In-Reply-To: <20090607081937.GC4547@lenovo>
Commit-ID: a4046f8d299e00e9855ae292527c2d66a42670eb
Gitweb: http://git.kernel.org/tip/a4046f8d299e00e9855ae292527c2d66a42670eb
Author: Cyrill Gorcunov <gorcunov@openvz.org>
AuthorDate: Sun, 7 Jun 2009 12:19:37 +0400
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 7 Jun 2009 16:22:02 +0200
x86, nmi: Use predefined numbers instead of hardcoded one
[ Impact: cleanup ]
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <20090607081937.GC4547@lenovo>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/nmi.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index c45a0a5..c972644 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
@@ -64,7 +64,7 @@ static inline int nmi_watchdog_active(void)
* but since they are power of two we could use a
* cheaper way --cvg
*/
- return nmi_watchdog & 0x3;
+ return nmi_watchdog & (NMI_LOCAL_APIC | NMI_IO_APIC);
}
#endif
prev parent reply other threads:[~2009-06-07 14:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-07 8:19 [PATCH -tip] nmi: use predefined numbers instead of hardcoded one Cyrill Gorcunov
2009-06-07 14:24 ` tip-bot for Cyrill Gorcunov [this message]
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=tip-a4046f8d299e00e9855ae292527c2d66a42670eb@git.kernel.org \
--to=gorcunov@openvz.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--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.