Hi,

some fixes related to warnings when you switch on Xenomai's NMI watchdog.

Jan
Index: include/asm-i386/system.h
===================================================================
--- include/asm-i386/system.h	(Revision 191)
+++ include/asm-i386/system.h	(Arbeitskopie)
@@ -602,9 +602,11 @@
        handler would simply occur after 4 billions ticks. */
     rthal_timer_program_shot(rthal_imuldiv(delay,RTHAL_TIMER_FREQ,RTHAL_CPU_FREQ));
 #ifdef CONFIG_XENO_HW_NMI_DEBUG_LATENCY
-    extern unsigned long rthal_maxlat_tsc;
-    if (delay <= (ULONG_MAX - rthal_maxlat_tsc))
-        rthal_nmi_arm(delay + rthal_maxlat_tsc);
+    {
+        extern unsigned long rthal_maxlat_tsc;
+        if (delay <= (ULONG_MAX - rthal_maxlat_tsc))
+            rthal_nmi_arm(delay + rthal_maxlat_tsc);
+    }
 #endif /* CONFIG_XENO_HW_NMI_DEBUG_LATENCY */
 }
 
Index: ChangeLog
===================================================================
--- ChangeLog	(Revision 191)
+++ ChangeLog	(Arbeitskopie)
@@ -1,3 +1,11 @@
+2005-11-28  Jan Kiszka <[EMAIL PROTECTED]>
+
+	* ksrc/arch/i386/Kconfig: Fixed XENO_HW_NMI_DEBUG_LATENCY_MAX
+	kconfig type.
+
+	* include/asm-i386/system.h, ksrc/arch/i386/hal.c: Fixed
+	harmless compiler warnings.
+
 2005-11-25  Jan Kiszka <[EMAIL PROTECTED]>
 
 	* ksrc/skins/native/{pipe.c,syscall.c}, src/skins/native/pipe.c,
Index: ksrc/arch/i386/Kconfig
===================================================================
--- ksrc/arch/i386/Kconfig	(Revision 191)
+++ ksrc/arch/i386/Kconfig	(Arbeitskopie)
@@ -81,8 +81,8 @@
 
 config XENO_HW_NMI_DEBUG_LATENCY_MAX
         depends XENO_HW_NMI_DEBUG_LATENCY
-        string "NMI watchdog latency threshold (us)"
-        default "100"
+        int "NMI watchdog latency threshold (us)"
+        default 100
         help
         When the timer interrupt latency goes above this threshold, the
         NMI watchdog pulls the handbrake.
Index: ksrc/arch/i386/hal.c
===================================================================
--- ksrc/arch/i386/hal.c	(Revision 191)
+++ ksrc/arch/i386/hal.c	(Arbeitskopie)
@@ -175,6 +175,8 @@
 }
 
 #ifdef CONFIG_XENO_HW_NMI_DEBUG_LATENCY
+#include <asm/nmi.h>
+
 unsigned long rthal_maxlat_tsc;
 EXPORT_SYMBOL(rthal_maxlat_tsc);
 

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to