* [Xenomai-core] [PULL REQUEST] x86-hal: Include fix for NMI watchdog on 2.6.31
@ 2009-09-19 11:30 Jan Kiszka
0 siblings, 0 replies; only message in thread
From: Jan Kiszka @ 2009-09-19 11:30 UTC (permalink / raw)
To: Philippe Gerum; +Cc: xenomai-core
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
The following changes since commit 280f42f0874d00b8ea0ca8b966e568604eec17f0:
Jan Kiszka (1):
rtipc: Fix 64-bit related warnings
are available in the git repository at:
git://xenomai.org/xenomai-jki.git for-upstream
Jan Kiszka (1):
x86-hal: Include fix for NMI watchdog on 2.6.31
ksrc/arch/x86/nmi.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
x86-hal: Include fix for NMI watchdog on 2.6.31
Signed-off-by: Jan Kiszka <jan.kiszka@domain.hid>
diff --git a/ksrc/arch/x86/nmi.c b/ksrc/arch/x86/nmi.c
index a9d9380..19cd16f 100644
--- a/ksrc/arch/x86/nmi.c
+++ b/ksrc/arch/x86/nmi.c
@@ -29,7 +29,9 @@
#include <linux/version.h>
#include <linux/nmi.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+#include <asm/perf_counter.h>
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
#include <asm/intel_arch_perfmon.h>
#endif /* Linux < 2.6.19 */
#include <asm/nmi.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-09-19 11:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-19 11:30 [Xenomai-core] [PULL REQUEST] x86-hal: Include fix for NMI watchdog on 2.6.31 Jan Kiszka
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.