Module: xenomai-abe
Branch: comedi
Commit: da94942c29fc0770654c5afd8aad7a6174f6cca3
URL:    
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=da94942c29fc0770654c5afd8aad7a6174f6cca3

Author: Jan Kiszka <jan.kis...@siemens.com>
Date:   Sat Sep 19 13:23:55 2009 +0200

x86-hal: Include fix for NMI watchdog on 2.6.31

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 ksrc/arch/x86/nmi.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

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>


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to