[Xenomai-core] [patch] fix SMI and proc cleanup

[Xenomai-core] [patch] fix SMI and proc cleanup

[Jan Kiszka]

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

Hi,

the smaller the bug is, the longer it takes to track. The first one in
this patch was such an issue. It prevented the SMI workaround to do its
job because the related PCI ID table got "optimised" away (SVN trunk only).

The second one is also SVN-only. It fixes the proc-fs cleanup of the
nucleus when being used as a module.

I also removed some special character from a name in the ChangeLog.

Please apply!

Jan


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: smi_and_proc_fix.patch --]
[-- Type: text/x-patch; name="smi_and_proc_fix.patch", Size: 2080 bytes --]

Index: ChangeLog
===================================================================
--- ChangeLog	(Revision 208)
+++ ChangeLog	(Arbeitskopie)
@@ -1,3 +1,11 @@
+2005-11-30  Jan Kiszka <jan.kiszka@domain.hid>
+
+	* ksrc/arch/i386/smi.c: Remove __initdata from rthal_smi_pci_tbl
+	to make table persistent.
+
+	* ksrc/nucleus/module.c (__xeno_sys_exit): Reorder proc-fs
+	cleanup to avoid stalled entries.
+
 2005-11-29  Philippe Gerum  <rpm@xenomai.org>
 
 	* ksrc/nucleus/pipe.c (xnpipe_recv): Remove superfluous timeout
@@ -623,7 +631,7 @@
 
 	* nucleus/module.c: Revamp /proc/xenomai/{sched,stat} output format.
 
-2005-08-31  Stéphane Fillod  <stephane.fillod@domain.hid>
+2005-08-31  Stephane Fillod  <stephane.fillod@domain.hid>
 
 	* skins/rtai/fifo.c (__fifo_pkg_init): fix missing init of flush
 	queue handles.
Index: ksrc/arch/i386/smi.c
===================================================================
--- ksrc/arch/i386/smi.c	(Revision 208)
+++ ksrc/arch/i386/smi.c	(Arbeitskopie)
@@ -31,7 +31,7 @@
 #include <linux/reboot.h>
 #include <asm/xenomai/smi.h>
 
-static struct pci_device_id rthal_smi_pci_tbl[] __initdata = {
+static struct pci_device_id rthal_smi_pci_tbl[] = {
 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0) },
 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0) },
 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0) },
Index: ksrc/nucleus/module.c
===================================================================
--- ksrc/nucleus/module.c	(Revision 208)
+++ ksrc/nucleus/module.c	(Arbeitskopie)
@@ -817,6 +817,10 @@
 {
     xnpod_shutdown(XNPOD_NORMAL_EXIT);
 
+#if defined(__KERNEL__) && defined(CONFIG_PROC_FS)
+    xnpod_delete_proc();
+#endif /* __KERNEL__ && CONFIG_PROC_FS */
+
     xnarch_exit();
 
 #ifdef __KERNEL__
@@ -830,9 +834,6 @@
 #ifdef CONFIG_LTT
     xnltt_umount();
 #endif /* CONFIG_LTT */
-#ifdef CONFIG_PROC_FS
-    xnpod_delete_proc();
-#endif /* CONFIG_PROC_FS */
 #endif /* __KERNEL__ */
 
     if (nkmsgbuf)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 256 bytes --]

Re: [Xenomai-core] [patch] fix SMI and proc cleanup

[Philippe Gerum]

Jan Kiszka wrote:
> Hi,
> 
> the smaller the bug is, the longer it takes to track. The first one in
> this patch was such an issue. It prevented the SMI workaround to do its
> job because the related PCI ID table got "optimised" away (SVN trunk only).

Good catch. Fact is that this table must survive free_initmem() now 
since we want to enable the SMI watchdog only when the nucleus is 
actually running a real-time interface.

> 
> The second one is also SVN-only. It fixes the proc-fs cleanup of the
> nucleus when being used as a module.
> 
> I also removed some special character from a name in the ChangeLog.
> 
> Please apply!
> 

Applied, thanks.

> Jan
> 
> 
> 
> ------------------------------------------------------------------------
> 
> Index: ChangeLog
> ===================================================================
> --- ChangeLog	(Revision 208)
> +++ ChangeLog	(Arbeitskopie)
> @@ -1,3 +1,11 @@
> +2005-11-30  Jan Kiszka <jan.kiszka@domain.hid>
> +
> +	* ksrc/arch/i386/smi.c: Remove __initdata from rthal_smi_pci_tbl
> +	to make table persistent.
> +
> +	* ksrc/nucleus/module.c (__xeno_sys_exit): Reorder proc-fs
> +	cleanup to avoid stalled entries.
> +
>  2005-11-29  Philippe Gerum  <rpm@xenomai.org>
>  
>  	* ksrc/nucleus/pipe.c (xnpipe_recv): Remove superfluous timeout
> @@ -623,7 +631,7 @@
>  
>  	* nucleus/module.c: Revamp /proc/xenomai/{sched,stat} output format.
>  
> -2005-08-31  Stéphane Fillod  <stephane.fillod@domain.hid>
> +2005-08-31  Stephane Fillod  <stephane.fillod@domain.hid>
>  
>  	* skins/rtai/fifo.c (__fifo_pkg_init): fix missing init of flush
>  	queue handles.
> Index: ksrc/arch/i386/smi.c
> ===================================================================
> --- ksrc/arch/i386/smi.c	(Revision 208)
> +++ ksrc/arch/i386/smi.c	(Arbeitskopie)
> @@ -31,7 +31,7 @@
>  #include <linux/reboot.h>
>  #include <asm/xenomai/smi.h>
>  
> -static struct pci_device_id rthal_smi_pci_tbl[] __initdata = {
> +static struct pci_device_id rthal_smi_pci_tbl[] = {
>  { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_0) },
>  { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_0) },
>  { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0) },
> Index: ksrc/nucleus/module.c
> ===================================================================
> --- ksrc/nucleus/module.c	(Revision 208)
> +++ ksrc/nucleus/module.c	(Arbeitskopie)
> @@ -817,6 +817,10 @@
>  {
>      xnpod_shutdown(XNPOD_NORMAL_EXIT);
>  
> +#if defined(__KERNEL__) && defined(CONFIG_PROC_FS)
> +    xnpod_delete_proc();
> +#endif /* __KERNEL__ && CONFIG_PROC_FS */
> +
>      xnarch_exit();
>  
>  #ifdef __KERNEL__
> @@ -830,9 +834,6 @@
>  #ifdef CONFIG_LTT
>      xnltt_umount();
>  #endif /* CONFIG_LTT */
> -#ifdef CONFIG_PROC_FS
> -    xnpod_delete_proc();
> -#endif /* CONFIG_PROC_FS */
>  #endif /* __KERNEL__ */
>  
>      if (nkmsgbuf)
> 
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Xenomai-core mailing list
> Xenomai-core@domain.hid
> https://mail.gna.org/listinfo/xenomai-core


-- 

Philippe.