Merge branch 'wip-mcrit-mac' into wip-mc

Conflicts:
	bin/rtspin.c

This patch provides necessary changes to liblitmus for the mixed criticality
plugin.

1 files changed, 3 insertions, 1 deletions

diff --git a/include/litmus.h b/include/litmus.h
index b798c92..632b9e1 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -38,6 +38,7 @@ int sporadic_task(
 int sporadic_task_ns(
                 lt_t e, lt_t p, lt_t phase,
                 int cpu, task_class_t cls,
+        crit_level_t crit,
                 budget_policy_t budget_policy, int set_cpu_set);
 
 /* budget enforcement off by default in these macros */
@@ -83,7 +84,7 @@ typedef int (*rt_fn_t)(void*);
 
 /* These two functions configure the RT task to use enforced exe budgets */
 int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period);
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet,
+int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, crit_level_t crit, int wcet,
                      int period, task_class_t cls);
 
 /*      per-task modes */
@@ -95,6 +96,7 @@ int task_mode(int target_mode);
 
 void show_rt_param(struct rt_task* tp);
 task_class_t str2class(const char* str);
+crit_level_t str2crit(const char* str);
 
 /* non-preemptive section support */
 void enter_np(void);