2 files changed, 6 insertions, 3 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index dffea128739f..9debea981419 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -266,8 +266,8 @@ static void check_for_preemptions(void)
             last = lowest_prio_cpu()) {
                 /* preemption necessary */
                 task = __take_ready(&gsnedf);
-                TRACE("check_for_preemptions: attempting to link task %d to %d\n",
-                      task->pid, last->cpu);
+                TRACE_TASK(task, "attempting to link to P%d\n",
+                      last->cpu);
                 if (last->linked)
                         requeue(last->linked);
                 link_task_to_cpu(task, last);
@@ -409,7 +409,7 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
                            "state:%d sig:%d\n",
                            blocks, out_of_time, np, sleep, preempt,
                            prev->state, signal_pending(prev));
-        if (entry->linked && preempt)
+        if (entry->linked && preempt && !np)
                 TRACE_TASK(prev, "will be preempted by %s/%d\n",
                            entry->linked->comm, entry->linked->pid);
 
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 0687be0c8a78..faf2312b762e 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -197,6 +197,9 @@ static void yield_task_litmus(struct rq *rq)
         TS_SYSCALL_IN_START;
 
         TS_SYSCALL_OUT_END;
+
+        TRACE_CUR("yields\n");
+
         BUG_ON(rq->curr != current);
         /* sched_yield() is called to trigger delayed preemptions.
          * Thus, mark the current task as needing to be rescheduled.