* [PATCH -tip] nmi: use predefined numbers instead of hardcoded one
@ 2009-06-07 8:19 Cyrill Gorcunov
2009-06-07 14:24 ` [tip:x86/cleanups] x86, nmi: Use " tip-bot for Cyrill Gorcunov
0 siblings, 1 reply; 2+ messages in thread
From: Cyrill Gorcunov @ 2009-06-07 8:19 UTC (permalink / raw)
To: Ingo Molnar; +Cc: H. Peter Anvin, Thomas Gleixner, LKML
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
I should have it done long time ago but anyway.
arch/x86/include/asm/nmi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.git/arch/x86/include/asm/nmi.h
=====================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/nmi.h
+++ linux-2.6.git/arch/x86/include/asm/nmi.h
@@ -64,7 +64,7 @@ static inline int nmi_watchdog_active(vo
* 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/cleanups] x86, nmi: Use predefined numbers instead of hardcoded one
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
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Cyrill Gorcunov @ 2009-06-07 14:24 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, gorcunov, tglx, mingo
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-07 14:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-07 8:19 [PATCH -tip] nmi: use predefined numbers instead of hardcoded one Cyrill Gorcunov
2009-06-07 14:24 ` [tip:x86/cleanups] x86, nmi: Use " tip-bot for Cyrill Gorcunov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox