Module: xenomai-2.5
Branch: master
Commit: 0a80911ae7023f393f56697db372b92ff89d8660
URL:    
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=0a80911ae7023f393f56697db372b92ff89d8660

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Wed Jun 29 13:16:32 2011 +0200

hal x86: disable NMI watchdog check for 2.6.38 and later

---

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

diff --git a/ksrc/arch/x86/hal_32.c b/ksrc/arch/x86/hal_32.c
index 5f5ff2c..a0948b1 100644
--- a/ksrc/arch/x86/hal_32.c
+++ b/ksrc/arch/x86/hal_32.c
@@ -337,7 +337,8 @@ int rthal_arch_init(void)
                rthal_smi_restore();
                return -ENODEV;
        }
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2.6.38) \
+       && defined(CONFIG_GENERIC_CLOCKEVENTS)
        if (nmi_watchdog == NMI_IO_APIC) {
                printk("Xenomai: NMI kernel watchdog set to NMI_IO_APIC 
(nmi_watchdog=1).\n"
                       "         This will disable the LAPIC as a clock device, 
and\n"


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

Reply via email to