Merge branch 'wip-pai' into wip-gpu-interrupts

Conflicts:
	include/litmus/affinity.h
	kernel/sched.c
	kernel/softirq.c
	litmus/Kconfig
	litmus/affinity.c
	litmus/litmus.c
	litmus/preempt.c
	litmus/sched_cedf.c
	litmus/sched_gsn_edf.c

1 files changed, 2 insertions, 0 deletions

diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 5a15ce938984..9a6fe487718e 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -103,7 +103,9 @@ litmus_schedule(struct rq *rq, struct task_struct *prev)
                 }
 #ifdef  __ARCH_WANT_UNLOCKED_CTXSW
                 if (next->oncpu)
+                {
                         TRACE_TASK(next, "waiting for !oncpu");
+                }
                 while (next->oncpu) {
                         cpu_relax();
                         mb();