1 files changed, 15 insertions, 2 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 875783e6a67b..2da61fa58bdc 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -26,16 +26,20 @@ static inline int in_list(struct list_head* list)
                 );
 }
 
+
 struct task_struct* __waitqueue_remove_first(wait_queue_head_t *wq);
 
 #define NO_CPU                  0xffffffff
 
 void litmus_fork(struct task_struct *tsk);
+void litmus_post_fork_thread(struct task_struct *tsk);
 void litmus_exec(void);
 /* clean up real-time state of a task */
 void exit_litmus(struct task_struct *dead_tsk);
 
 long litmus_admit_task(struct task_struct *tsk);
+
+void litmus_pre_exit_task(struct task_struct *tsk); // called before litmus_exit_task, but without run queue locks held
 void litmus_exit_task(struct task_struct *tsk);
 
 #define is_realtime(t)          ((t)->policy == SCHED_LITMUS)
@@ -43,6 +47,7 @@ void litmus_exit_task(struct task_struct *tsk);
         ((t)->rt_param.transition_pending)
 
 #define tsk_rt(t)               (&(t)->rt_param)
+#define tsk_aux(t)              (&(t)->aux_data)
 
 /*      Realtime utility macros */
 #define is_priority_boosted(t)  (tsk_rt(t)->priority_boosted)
@@ -60,9 +65,13 @@ void litmus_exit_task(struct task_struct *tsk);
 /* job_param macros */
 #define get_exec_time(t)    (tsk_rt(t)->job_params.exec_time)
 #define get_deadline(t)         (tsk_rt(t)->job_params.deadline)
+#define get_period(t)           (tsk_rt(t)->task_params.period)
 #define get_release(t)          (tsk_rt(t)->job_params.release)
 #define get_lateness(t)         (tsk_rt(t)->job_params.lateness)
 
+#define effective_priority(t) ((!(tsk_rt(t)->inh_task)) ? t : tsk_rt(t)->inh_task)
+#define base_priority(t) (t)
+
 #define is_hrt(t)               \
         (tsk_rt(t)->task_params.cls == RT_CLASS_HARD)
 #define is_srt(t)               \
@@ -99,10 +108,12 @@ static inline lt_t litmus_clock(void)
 #define earlier_deadline(a, b) (lt_before(\
         (a)->rt_param.job_params.deadline,\
         (b)->rt_param.job_params.deadline))
+#define shorter_period(a, b) (lt_before(\
+        (a)->rt_param.task_params.period,\
+        (b)->rt_param.task_params.period))
 #define earlier_release(a, b)  (lt_before(\
         (a)->rt_param.job_params.release,\
         (b)->rt_param.job_params.release))
-
 void preempt_if_preemptable(struct task_struct* t, int on_cpu);
 
 #ifdef CONFIG_LITMUS_LOCKING
@@ -174,8 +185,10 @@ static inline int request_exit_np_atomic(struct task_struct *t)
                          * retry loop here since tasks might exploit that to
                          * keep the kernel busy indefinitely. */
                 }
-        } else
+        }
+        else {
                 return 0;
+        }
 }
 
 #else