1 files changed, 8 insertions, 11 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index ed9b4697a5a2..04b189e54b03 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -1050,7 +1050,7 @@ static void gsnedf_task_wake_up(struct task_struct *task)
 #endif
 
 #ifdef CONFIG_REALTIME_AUX_TASKS
-        if (tsk_rt(task)->has_aux_tasks) {
+        if (tsk_rt(task)->has_aux_tasks && !tsk_rt(task)->hide_from_aux_tasks) {
                 TRACE_CUR("%s/%d is ready so aux tasks may not inherit.\n", task->comm, task->pid);
                 disable_aux_task_owner(task);
         }
@@ -1072,7 +1072,7 @@ static void gsnedf_task_block(struct task_struct *t)
         unlink(t);
 
 #ifdef CONFIG_REALTIME_AUX_TASKS
-        if (tsk_rt(t)->has_aux_tasks) {
+        if (tsk_rt(t)->has_aux_tasks && !tsk_rt(t)->hide_from_aux_tasks) {
 
                 TRACE_CUR("%s/%d is blocked so aux tasks may inherit.\n", t->comm, t->pid);
                 enable_aux_task_owner(t);
@@ -1093,19 +1093,16 @@ static void gsnedf_task_exit(struct task_struct * t)
         gsnedf_change_prio_pai_tasklet(t, NULL);
 #endif
 
-#ifdef CONFIG_REALTIME_AUX_TASKS
-        if (tsk_rt(t)->is_aux_task) {
-                exit_aux_task(t); /* cannot be called with gsnedf_lock held */
-        }
-#endif
-
         /* unlink if necessary */
         raw_spin_lock_irqsave(&gsnedf_lock, flags);
 
 #ifdef CONFIG_REALTIME_AUX_TASKS
         /* make sure we clean up on our way out */
-        if(tsk_rt(t)->has_aux_tasks) {
-                disable_aux_task_owner(t); /* must be called witl gsnedf_lock held */
+        if (unlikely(tsk_rt(t)->is_aux_task)) {
+                exit_aux_task(t);
+        }
+        else if(tsk_rt(t)->has_aux_tasks) {
+                disable_aux_task_owner(t);
         }
 #endif
 
@@ -1664,7 +1661,7 @@ int gsnedf_fmlp_lock(struct litmus_lock* l)
                  * there is only one wake up per release.
                  */
 
-                schedule();
+                suspend_for_lock();
 
                 TS_LOCK_RESUME;