1 files changed, 18 insertions, 0 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 11ccaafd50de..301390148d02 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -17,6 +17,10 @@
 #include <litmus/litmus_proc.h>
 #include <litmus/sched_trace.h>
 
+#ifdef CONFIG_SCHED_CPU_AFFINITY
+#include <litmus/affinity.h>
+#endif
+
 /* Number of RT tasks that exist in the system */
 atomic_t rt_task_count          = ATOMIC_INIT(0);
 static DEFINE_RAW_SPINLOCK(task_transition_lock);
@@ -110,6 +114,14 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
                        "because wcet > period\n", pid);
                 goto out_unlock;
         }
+        if (    tp.cls != RT_CLASS_HARD &&
+                tp.cls != RT_CLASS_SOFT &&
+                tp.cls != RT_CLASS_BEST_EFFORT)
+        {
+                printk(KERN_INFO "litmus: real-time task %d rejected "
+                                 "because its class is invalid\n", pid);
+                goto out_unlock;
+        }
         if (tp.budget_policy != NO_ENFORCEMENT &&
             tp.budget_policy != QUANTUM_ENFORCEMENT &&
             tp.budget_policy != PRECISE_ENFORCEMENT)
@@ -517,6 +529,8 @@ static int __init _init_litmus(void)
          */
         printk("Starting LITMUS^RT kernel\n");
 
+        BUILD_BUG_ON(sizeof(union np_flag) != sizeof(uint32_t));
+
         register_sched_plugin(&linux_sched_plugin);
 
         bheap_node_cache    = KMEM_CACHE(bheap_node, SLAB_PANIC);
@@ -532,6 +546,10 @@ static int __init _init_litmus(void)
 
         init_litmus_proc();
 
+#ifdef CONFIG_SCHED_CPU_AFFINITY
+        init_topology();
+#endif
+
         return 0;
 }