initial fixes

1 files changed, 3 insertions, 3 deletions

diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 134019247b08..58fb372d2d12 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -183,8 +183,8 @@ static struct task_struct* psnedf_schedule(struct task_struct * prev)
          * differently from gedf, when a task exits (dead)
          * pedf->schedule may be null and prev _is_ realtime
          */
-        BUG_ON(pedf->scheduled && pedf->scheduled != prev);
-        BUG_ON(pedf->scheduled && !is_realtime(prev));
+        BUG_ON(prev && pedf->scheduled && pedf->scheduled != prev);
+        BUG_ON(prev && pedf->scheduled && !is_realtime(prev));
 
         /* (0) Determine state */
         exists      = pedf->scheduled != NULL;
@@ -193,7 +193,7 @@ static struct task_struct* psnedf_schedule(struct task_struct * prev)
                              && budget_exhausted(pedf->scheduled);
         np          = exists && is_np(pedf->scheduled);
         sleep       = exists && is_completed(pedf->scheduled);
-        preempt     = edf_preemption_needed(edf, prev);
+        preempt     = !prev || edf_preemption_needed(edf, prev);
 
         /* If we need to preempt do so.
          * The following checks set resched to 1 in case of special