Merge branch 'prop/robust-tie-break' into wip-gpu-rtas12

Conflicts:
	include/litmus/binheap.h
	include/litmus/fdso.h
	include/litmus/litmus.h
	litmus/Makefile
	litmus/binheap.c
	litmus/edf_common.c
	litmus/fdso.c
	litmus/jobs.c
	litmus/locking.c

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index f3d9a69a3777..9e8d8698323b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -80,6 +80,9 @@
 #include "workqueue_sched.h"
 #include "sched_autogroup.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/sched.h>
+
 #include <litmus/sched_trace.h>
 #include <litmus/trace.h>
 
@@ -89,9 +92,6 @@
 
 static void litmus_tick(struct rq*, struct task_struct*);
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/sched.h>
-
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
  * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],