[Xenomai-git] Philippe Gerum : cobalt/init: disable support globally if no rt-CPU avail

[git repository hosting]

Module: xenomai-forge
Branch: next
Commit: c68e450a5389c1dd4ea2e70839c4f1a2cacc1af7
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=c68e450a5389c1dd4ea2e70839c4f1a2cacc1af7

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu Feb 20 11:21:18 2014 +0100

cobalt/init: disable support globally if no rt-CPU avail

---

 kernel/cobalt/init.c |   39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/kernel/cobalt/init.c b/kernel/cobalt/init.c
index b364676..92de41d 100644
--- a/kernel/cobalt/init.c
+++ b/kernel/cobalt/init.c
@@ -139,21 +139,8 @@ static void sys_shutdown(void)
 
 static int __init mach_setup(void)
 {
-       int ret, virq, __maybe_unused cpu;
        struct ipipe_sysinfo sysinfo;
-
-#ifdef CONFIG_SMP
-       cpus_clear(xnarch_machdata.supported_cpus);
-       for_each_online_cpu(cpu) {
-               if (supported_cpus_arg & (1UL << cpu))
-                       cpu_set(cpu, xnarch_machdata.supported_cpus);
-       }
-#endif /* CONFIG_SMP */
-
-       if (cpumask_empty(&xnsched_realtime_cpus)) {
-               printk(XENO_WARN "disabled via empty real-time CPU mask\n");
-               return -ENOSYS;
-       }
+       int ret, virq;
 
        ret = ipipe_select_timers(&xnsched_realtime_cpus);
        if (ret < 0)
@@ -373,12 +360,25 @@ static __init int sys_init(void)
 
 static int __init xenomai_init(void)
 {
-       int ret;
+       int ret, __maybe_unused cpu;
 
        if (__xnsys_disabled) {
                printk(XENO_WARN "disabled on kernel command line\n");
-               return -ENOSYS;
+               return 0;
+       }
+
+#ifdef CONFIG_SMP
+       cpus_clear(xnsched_realtime_cpus);
+       for_each_online_cpu(cpu) {
+               if (supported_cpus_arg & (1UL << cpu))
+                       cpu_set(cpu, xnsched_realtime_cpus);
        }
+       if (cpumask_empty(&xnsched_realtime_cpus)) {
+               printk(XENO_WARN "disabled via empty real-time CPU mask\n");
+               __xnsys_disabled = 1;
+               return 0;
+       }
+#endif /* CONFIG_SMP */
 
        xnsched_register_classes();
 
@@ -390,13 +390,6 @@ static int __init xenomai_init(void)
        if (ret)
                goto cleanup_proc;
 
-       cpus_and(nkaffinity, nkaffinity, xnsched_realtime_cpus);
-       if (cpus_empty(nkaffinity)) {
-               printk(XENO_ERR "no real-time CPU in global affinity mask\n");
-               ret = -EINVAL;
-               goto cleanup_mach;
-       }
-
        ret = xnheap_mount();
        if (ret)
                goto cleanup_mach;


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git