Merge branch 'gh/staging' into temp

Conflicts:
	include/litmus/litmus.h
	include/litmus/rt_param.h
	litmus/Makefile
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c

1 files changed, 5 insertions, 2 deletions

diff --git a/litmus/litmus_softirq.c b/litmus/litmus_softirq.c
index aa83b363be7c..6ecea650673b 100644
--- a/litmus/litmus_softirq.c
+++ b/litmus/litmus_softirq.c
@@ -263,14 +263,17 @@ static int become_litmus_daemon(struct task_struct* tsk)
     int ret = 0;
 
         struct rt_task tp = {
+                .exec_cost = KLMIRQD_SLICE_NS,
                 .period = KLMIRQD_SLICE_NS,
                 .relative_deadline = KLMIRQD_SLICE_NS,
-                .exec_cost = KLMIRQD_SLICE_NS,
                 .phase = 0,
                 .cpu = task_cpu(current),
+                .priority = LITMUS_LOWEST_PRIORITY,
+                .cls = RT_CLASS_BEST_EFFORT,
                 .budget_policy = NO_ENFORCEMENT,
                 .budget_signal_policy = NO_SIGNALS,
-                .cls = RT_CLASS_BEST_EFFORT
+                /* use SPORADIC instead of EARLY since util = 1.0 */
+                .release_policy = SPORADIC,
         };
 
         struct sched_param param = { .sched_priority = 0};