[Xenomai-core] [PATCH] NMI-watchdog related fixes

[Xenomai-core] [PATCH] NMI-watchdog related fixes

[Jan Kiszka]

[-- Attachment #1.1: Type: text/plain, Size: 84 bytes --]

Hi,

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

Jan

[-- Attachment #1.2: nmi-wd.patch --]
[-- Type: text/x-patch, Size: 2163 bytes --]

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 <jan.kiszka@domain.hid>
+
+	* 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 <jan.kiszka@domain.hid>
 
 	* 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 256 bytes --]

Re: [Xenomai-core] [PATCH] NMI-watchdog related fixes

[Philippe Gerum]

Jan Kiszka wrote:
> Hi,
> 
> some fixes related to warnings when you switch on Xenomai's NMI watchdog.
> 

Applied, thanks.

> 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 <jan.kiszka@domain.hid>
> +
> +	* 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 <jan.kiszka@domain.hid>
>  
>  	* 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);
>  
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Xenomai-core mailing list
> Xenomai-core@domain.hid
> https://mail.gna.org/listinfo/xenomai-core


-- 

Philippe.