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.kis...@siemens.com>
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>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Xenomai-core mailing list Xenomai-core@gna.org https://mail.gna.org/listinfo/xenomai-core
