Skip to contentSkip to conversation

NMI-watchdog related fixes

PATCH Applied Jan Kiszka 2 participants 2 messages Nov 28, 2005

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 NMI-watchdog related fixes

Hi,

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

Jan

asm-i386/system.h +5 -3
Index: include/asm-i386/system.h
===================================================================
@@ -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 */
 }
ChangeLog +8 -0
Index: ChangeLog
===================================================================
@@ -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,
arch/i386/Kconfig +2 -2
Index: ksrc/arch/i386/Kconfig
===================================================================
@@ -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.
arch/i386/hal.c +2 -0
Index: ksrc/arch/i386/hal.c
===================================================================
@@ -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);
Applied
#1 lore raw
Quoted 4 lines · Jan Kiszka

Hi,

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

Applied, thanks.

Quoted 76 lines

Jan

------------------------------------------------------------------------

Index: include/asm-i386/system.h
===================================================================

asm-i386/system.h +5 -3
@@ -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 +8 -0
@@ -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
===================================================================

arch/i386/Kconfig +2 -2
@@ -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
===================================================================

arch/i386/hal.c +2 -1
@@ -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);
 
 
 
------------------------------------------------------------------------

_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core

Signature · 1 line
Philippe.