Module: xenomai-head Branch: master Commit: d1afc1230f7f94b714e6f5a9bd1619bfea636cde URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=d1afc1230f7f94b714e6f5a9bd1619bfea636cde
Author: Philippe Gerum <r...@xenomai.org> Date: Thu Dec 31 16:48:40 2009 +0100 x86: fix build of NMI watchdog support for 2.6.32 --- ksrc/arch/x86/nmi.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ksrc/arch/x86/nmi.c b/ksrc/arch/x86/nmi.c index 283bcd0..e5e4867 100644 --- a/ksrc/arch/x86/nmi.c +++ b/ksrc/arch/x86/nmi.c @@ -29,12 +29,15 @@ #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,31) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) +#include <asm/perf_event.h> +#elif 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 */ +#else /* Linux < 2.6.19 */ #include <asm/nmi.h> +#endif /* Linux < 2.6.19 */ #else /* Linux < 2.6 */ #define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architecture PerfMon */ #define rdmsrl(reg, val) \ _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
