1 files changed, 9 insertions, 19 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index a1f10984adb3..e29a97235f26 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2601,8 +2601,12 @@ void scheduler_ipi(void)
         struct rq *rq = this_rq();
         struct task_struct *list = xchg(&rq->wake_list, NULL);
 
-        if (!list)
+        if (!list) {
+                /* If we don't call irq_enter(), we need to trigger the IRQ
+                 * tracing manually. */
+                ft_irq_fired();
                 return;
+        }
 
         /*
          * Not all reschedule IPI handlers call irq_enter/irq_exit, since
@@ -4420,23 +4424,20 @@ litmus_need_resched_nonpreemptible:
                 raw_spin_unlock_irq(&rq->lock);
         }
 
+        TS_SCHED2_START(prev);
         sched_trace_task_switch_to(current);
 
         post_schedule(rq);
 
         if (sched_state_validate_switch()) {
-                TRACE_CUR("cpu %d: have to redo scheduling decision!\n", cpu);
+                TS_SCHED2_END(prev);
                 goto litmus_need_resched_nonpreemptible;
         }
-        else if (current->policy == SCHED_LITMUS) {
-                TRACE_CUR("cpu %d: valid switch to rt task %s/%d.\n", cpu, current->comm, current->pid);
-        }
-        else {
-//              TRACE_CUR("cpu %d: switch: %s/%d\n", cpu, current->comm, current->pid);
-        }
 
         preempt_enable_no_resched();
 
+        TS_SCHED2_END(prev);
+
         if (need_resched())
                 goto need_resched;
 
@@ -4717,17 +4718,6 @@ void complete_all(struct completion *x)
 }
 EXPORT_SYMBOL(complete_all);
 
-void complete_n(struct completion *x, int n)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&x->wait.lock, flags);
-        x->done += n;
-        __wake_up_common(&x->wait, TASK_NORMAL, n, 0, NULL);
-        spin_unlock_irqrestore(&x->wait.lock, flags);
-}
-EXPORT_SYMBOL(complete_n);
-
 static inline long __sched
 do_wait_for_common(struct completion *x, long timeout, int state)
 {